diff mbox series

[5.4,034/152] xtensa: fix xtensa_pmu_setup prototype

Message ID	20200820091555.409042072@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=nT5k=B6=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Max Filippov <jcmvbkbc@gmail.com> Subject: [PATCH 5.4 034/152] xtensa: fix xtensa_pmu_setup prototype Date: Thu, 20 Aug 2020 11:20:01 +0200 Message-Id: <20200820091555.409042072@linuxfoundation.org> In-Reply-To: <20200820091553.615456912@linuxfoundation.org> References: <20200820091553.615456912@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,002/152] genirq/affinity: Make affinity setting if activated opt-in [5.4,003/152] genirq/PM: Always unlock IRQ descriptor in rearm_wake_irq() [5.4,006/152] PCI: Add device even if driver attach failed [5.4,007/152] PCI: qcom: Define some PARF params needed for ipq8064 SoC [5.4,011/152] btrfs: dont allocate anonymous block device for user invisible roots [5.4,012/152] btrfs: ref-verify: fix memory leak in add_block_entry [5.4,013/152] btrfs: stop incremening log_batch for the log root tree when syncing log [5.4,014/152] btrfs: remove no longer needed use of log_writers for the log root tree [5.4,017/152] btrfs: move the chunk_mutex in btrfs_read_chunk_tree [5.4,018/152] btrfs: relocation: review the call sites which can be interrupted by signal [5.4,019/152] btrfs: add missing check for nocow and compression inode flags [5.4,020/152] btrfs: avoid possible signal interruption of btrfs_drop_snapshot() on relocation tree [5.4,023/152] btrfs: fix race between page release and a fast fsync [5.4,024/152] btrfs: fix messages after changing compression level by remount [5.4,026/152] btrfs: inode: fix NULL pointer dereference if inode doesnt need compression [5.4,027/152] btrfs: fix memory leaks after failure to lookup checksums during inode logging [5.4,029/152] btrfs: fix return value mixup in btrfs_get_extent [5.4,033/152] xtensa: add missing exclusive access state management [5.4,034/152] xtensa: fix xtensa_pmu_setup prototype [5.4,037/152] powerpc: Allow 4224 bytes of stack expansion for the signal frame [5.4,039/152] pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH [5.4,042/152] net: stmmac: dwmac1000: provide multicast filter fallback [5.4,044/152] md/raid5: Fix Force reconstruct-write io stuck in degraded raid5 [5.4,046/152] bcache: fix overflow in offset_to_stripe() [5.4,048/152] driver core: Avoid binding drivers to dead devices [5.4,049/152] MIPS: CPU#0 is not hotpluggable [5.4,052/152] khugepaged: collapse_pte_mapped_thp() flush the right range [5.4,054/152] ocfs2: change slot number type s16 to u16 [5.4,055/152] mm/page_counter.c: fix protection usage propagation [5.4,057/152] ftrace: Setup correct FTRACE_FL_REGS flags for module [5.4,060/152] tracing: Use trace_sched_process_free() instead of exit() for pid tracing [5.4,062/152] watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options [5.4,063/152] watchdog: f71808e_wdt: remove use of wrong watchdog_info option [5.4,065/152] ceph: set sec_context xattr on symlink creation [5.4,068/152] module: Correctly truncate sysfs sections output [5.4,069/152] perf intel-pt: Fix FUP packet state [5.4,070/152] perf intel-pt: Fix duplicate branch after CBR [5.4,073/152] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load [5.4,076/152] pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ [5.4,077/152] crypto: algif_aead - Only wake up when ctx->more is zero [5.4,079/152] octeontx2-af: change (struct qmem)->entry_sz from u8 to u16 [5.4,082/152] RDMA/ipoib: Return void from ipoib_ib_dev_stop() [5.4,083/152] RDMA/ipoib: Fix ABBA deadlock with ipoib_reap_ah() [5.4,084/152] media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic [5.4,088/152] selftests/bpf: test_progs use another shell exit on non-actions [5.4,089/152] USB: serial: ftdi_sio: make process-packet buffer unsigned [5.4,090/152] USB: serial: ftdi_sio: clean up receive processing [5.4,092/152] crypto: af_alg - Fix regression on empty requests [5.4,095/152] RDMA/counter: Allow manually bind QPs with different pids to same counter [5.4,097/152] crypto: caam - Remove broken arc4 support [5.4,099/152] gpu: ipu-v3: image-convert: Wait for all EOFs before completing a tile [5.4,103/152] selftests/powerpc: ptrace-pkey: Update the test to mark an invalid pkey correctly [5.4,105/152] iommu/omap: Check for failure of a call to omap_iommu_dump_ctx [5.4,106/152] clk: qcom: gcc: fix sm8150 GPU and NPU clocks [5.4,108/152] iommu/vt-d: Enforce PASID devTLB field mask [5.4,110/152] clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk [5.4,111/152] clk: clk-atlas6: fix return value check in atlas6_clk_init() [5.4,113/152] tools build feature: Use CC and CXX from parent [5.4,114/152] i2c: rcar: avoid race when unregistering slave [5.4,115/152] nfs: ensure correct writeback errors are returned on close() [5.4,116/152] ubifs: Fix wrong orphan node deletion in ubifs_jnl_update\|rename [5.4,117/152] clk: bcm2835: Do not use prediv with bcm2711s PLLs [5.4,121/152] scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport [5.4,123/152] watchdog: initialize device before misc_register [5.4,124/152] md-cluster: Fix potential error pointer dereference in resize_bitmaps() [5.4,127/152] recordmcount: Fix build failure on non arm64 [5.4,128/152] drm/vmwgfx: Use correct vmw_legacy_display_unit pointer [5.4,130/152] net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_... [5.4,131/152] nfs: Fix getxattr kernel panic and memory overflow [5.4,134/152] fs/minix: remove expected error message in block_to_path() [5.4,135/152] fs/ufs: avoid potential u32 multiplication overflow [5.4,139/152] crypto: algif_aead - fix uninitialized ctx->init [5.4,142/152] tools build feature: Quote CC and CXX for their arguments [5.4,145/152] khugepaged: retract_page_tables() remember to test exit [5.4,146/152] arm64: dts: marvell: espressobin: add ethernet alias [5.4,147/152] drm/radeon: fix fb_div check in ni_init_smc_spll_table() [5.4,150/152] drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi [5.4,152/152] drm/amd/display: dchubbub p-state warning during surface planes switch

Commit Message

Greg Kroah-Hartman Aug. 20, 2020, 9:20 a.m. UTC

From: Max Filippov <jcmvbkbc@gmail.com>

commit 6d65d3769d1910379e1cfa61ebf387efc6bfb22c upstream.

Fix the following build error in configurations with
CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS=y:

  arch/xtensa/kernel/perf_event.c:420:29: error: passing argument 3 of
  ‘cpuhp_setup_state’ from incompatible pointer type

Cc: stable@vger.kernel.org
Fixes: 25a77b55e74c ("xtensa/perf: Convert the hotplug notifier to state machine callbacks")
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/xtensa/kernel/perf_event.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/arch/xtensa/kernel/perf_event.c
+++ b/arch/xtensa/kernel/perf_event.c
@@ -401,7 +401,7 @@  static struct pmu xtensa_pmu = {
 	.read = xtensa_pmu_read,
 };
 
-static int xtensa_pmu_setup(int cpu)
+static int xtensa_pmu_setup(unsigned int cpu)
 {
 	unsigned i;