Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc

[~andy/linux] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 96aae13c7960b7034f5185378c136f3308bf1df3..2f3fbf84215a940cc40eccef9c8304964d10906f 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -15,6 +15,7 @@
 #include <linux/smp.h>
 #include <linux/file.h>
 #include <linux/poll.h>
+#include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/dcache.h>
 #include <linux/percpu.h>
@@ -2784,12 +2785,11 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
        return NULL;
 }
 
-#ifdef CONFIG_EVENT_TRACING
 __weak
 void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip)
 {
 }
-#endif
+
 
 /*
  * Output