summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2010-04-03 12:22:05 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-04-03 12:22:05 +0200
commit26d80aa782e708c380a47601779d42d30bf016d6 (patch)
tree0d4c1357fa600123d1173d536537a88c8316e031
parentb0f86f5a169c758a82b0e23eef6795356f6d5a25 (diff)
downloadlinux-3.10-26d80aa782e708c380a47601779d42d30bf016d6.tar.gz
linux-3.10-26d80aa782e708c380a47601779d42d30bf016d6.tar.bz2
linux-3.10-26d80aa782e708c380a47601779d42d30bf016d6.zip
perf: Always build the stub perf_arch_fetch_caller_regs version
Now that software events use perf_arch_fetch_caller_regs() too, we need the stub version to be always built in for archs that don't implement it. Fixes the following build error in PARISC: kernel/built-in.o: In function `perf_event_task_sched_out': (.text.perf_event_task_sched_out+0x54): undefined reference to `perf_arch_fetch_caller_regs' Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org>
-rw-r--r--kernel/perf_event.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 96aae13c796..681af806d76 100644
--- a/kernel/perf_event.c
+++ b/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