Merge branch 'perf/urgent' into perf/core

[safe/jmp/linux-2.6] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 074ba2e..63fbce1 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2788,12 +2788,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