From 5ec48ab340421feb2505725a51aeb419e03ce9fc Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 3 Apr 2010 12:22:05 +0200
Subject: [PATCH] --- yaml --- r: 189434 b: refs/heads/master c:
 26d80aa782e708c380a47601779d42d30bf016d6 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dd221c5bd9cf..7fc2dcea0a24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0f86f5a169c758a82b0e23eef6795356f6d5a25
+refs/heads/master: 26d80aa782e708c380a47601779d42d30bf016d6
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 96aae13c7960..681af806d76b 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -2784,12 +2784,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