aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/perf_event.c2
-rw-r--r--include/linux/perf_event.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
index fbe101d7505d..08460a2e9f41 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)
1298} 1298}
1299 1299
1300static int __cpuinit 1300static int __cpuinit
1301power_pmu_notify(struct notifier_block *self, unsigned long action, void *hcpu) 1301power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
1302{ 1302{
1303 unsigned int cpu = (long)hcpu; 1303 unsigned int cpu = (long)hcpu;
1304 1304
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 70cffd052c04..95477038a72a 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -453,6 +453,7 @@ enum perf_callchain_context {
453#include <linux/pid_namespace.h> 453#include <linux/pid_namespace.h>
454#include <linux/workqueue.h> 454#include <linux/workqueue.h>
455#include <linux/ftrace.h> 455#include <linux/ftrace.h>
456#include <linux/cpu.h>
456#include <asm/atomic.h> 457#include <asm/atomic.h>
457 458
458#define PERF_MAX_STACK_DEPTH 255 459#define PERF_MAX_STACK_DEPTH 255