]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xtensa: fix xtensa_pmu_setup prototype
authorMax Filippov <jcmvbkbc@gmail.com>
Fri, 31 Jul 2020 19:37:32 +0000 (12:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 11:07:23 +0000 (13:07 +0200)
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

index 9bae79f70301339a20f08b5921d65d0ff6f76605..86c9ba9631551a4c043668f37556370fe04751be 100644 (file)
@@ -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;