| From 6d65d3769d1910379e1cfa61ebf387efc6bfb22c Mon Sep 17 00:00:00 2001 |
| From: Max Filippov <jcmvbkbc@gmail.com> |
| Date: Fri, 31 Jul 2020 12:37:32 -0700 |
| Subject: xtensa: fix xtensa_pmu_setup prototype |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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(-) |
| |
| --- a/arch/xtensa/kernel/perf_event.c |
| +++ b/arch/xtensa/kernel/perf_event.c |
| @@ -404,7 +404,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; |
| |
