diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-11 13:06:56 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-11 15:21:27 +0100 |
commit | 85cfabbcd10f8d112feee6e2ec64ee78033b6d3c (patch) | |
tree | f8c92931b845b6ec10a32336d107c8f34af512e6 | |
parent | 7ae5f21361fea11f58c398701da635f778635d13 (diff) | |
download | linux-3.10-85cfabbcd10f8d112feee6e2ec64ee78033b6d3c.tar.gz linux-3.10-85cfabbcd10f8d112feee6e2ec64ee78033b6d3c.tar.bz2 linux-3.10-85cfabbcd10f8d112feee6e2ec64ee78033b6d3c.zip |
perf, ppc: Fix compile error due to new cpu notifiers
Fix:
arch/powerpc/kernel/perf_event.c:1334: error: 'power_pmu_notifier' undeclared (first use in this function)
arch/powerpc/kernel/perf_event.c:1334: error: (Each undeclared identifier is reported only once
arch/powerpc/kernel/perf_event.c:1334: error: for each function it appears in.)
arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'power_pmu_notifier'
arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'register_cpu_notifier'
Due to commit 3f6da390 (perf: Rework and fix the arch CPU-hotplug hooks).
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/powerpc/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | include/linux/perf_event.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c index fbe101d7505..08460a2e9f4 100644 --- a/arch/powerpc/kernel/perf_event.c +++ b/arch/powerpc/kernel/perf_event.c @@ -1298,7 +1298,7 @@ static void power_pmu_setup(int cpu) } static int __cpuinit -power_pmu_notify(struct notifier_block *self, unsigned long action, void *hcpu) +power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) { unsigned int cpu = (long)hcpu; diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 70cffd052c0..95477038a72 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -453,6 +453,7 @@ enum perf_callchain_context { #include <linux/pid_namespace.h> #include <linux/workqueue.h> #include <linux/ftrace.h> +#include <linux/cpu.h> #include <asm/atomic.h> #define PERF_MAX_STACK_DEPTH 255 |