X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fperf_event.c;h=2f3fbf84215a940cc40eccef9c8304964d10906f;hb=b66696e3c0d8fc01efdbc701eba1276618332cb3;hp=96aae13c7960b7034f5185378c136f3308bf1df3;hpb=8bb39f9aa068262732fe44b965d7a6eb5a5a7d67;p=~andy%2Flinux

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 96aae13c796..2f3fbf84215 100644
--- 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