Prev: [tip:perf/urgent] kprobes: Calculate the index correctly when freeing the out-of-line execution slot
Next: [tip:sched/core] sched: Fix pick_next_highest_task_rt() for cgroups
From: tip-bot for Peter Zijlstra on 11 Mar 2010 09:50 Commit-ID: 85cfabbcd10f8d112feee6e2ec64ee78033b6d3c Gitweb: http://git.kernel.org/tip/85cfabbcd10f8d112feee6e2ec64ee78033b6d3c Author: Peter Zijlstra <a.p.zijlstra(a)chello.nl> AuthorDate: Thu, 11 Mar 2010 13:06:56 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Thu, 11 Mar 2010 15:21:27 +0100 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(a)chello.nl> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/powerpc/kernel/perf_event.c | 2 +- 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 fbe101d..08460a2 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 70cffd0..9547703 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |