perf fixes
Ingo,
Please pull the perf/urgent branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/urgent
Thanks,
Frederic
---
Frederic Weisbecker (2):
perf: Always build the stub perf_arch_fetch_caller_regs version
perf: Always build the powerpc perf_arch_fetch_caller_regs version
arch/powerpc/kernel/misc.S | 2 -- kernel/perf_event.c | 3 +-- 2 files changed, 1 insertions(+), 4 deletions(-)
PATCH 1/2 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'
--- kernel/perf_event.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/perf_event.c +1 -2
@@ -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
Signature · 1 line
1.6.2.3
PATCH 2/2 perf: Always build the powerpc perf_arch_fetch_caller_regs version
In reply to Frederic WeisbeckerNow that software events use perf_arch_fetch_caller_regs() too, we need the powerpc version to be always built.
Fixes the following build error:
(.text+0x3210): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x3324): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x33bc): undefined reference to `perf_arch_fetch_caller_regs' (.text+0x33ec): undefined reference to `perf_arch_fetch_caller_regs' (.text+0xd4a0): undefined reference to `perf_arch_fetch_caller_regs' arch/powerpc/kernel/built-in.o:(.text+0xd528): more undefined references to `perf_arch_fetch_caller_regs' follow make[1]: *** [.tmp_vmlinux1] Error 1 make: *** [sub-make] Error 2
--- arch/powerpc/kernel/misc.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
arch/powerpc/kernel/misc.S +0 -2
@@ -128,7 +128,6 @@ _GLOBAL(__restore_cpu_power7) /* place holder */ blr -#ifdef CONFIG_EVENT_TRACING /* * Get a minimal set of registers for our caller's nth caller. * r3 = regs pointer, r5 = n.
@@ -154,4 +153,3 @@ _GLOBAL(perf_arch_fetch_caller_regs) PPC_STL r4,_NIP-STACK_FRAME_OVERHEAD(r3) PPC_STL r7,_LINK-STACK_FRAME_OVERHEAD(r3) blr -#endif /* CONFIG_EVENT_TRACING */
Signature · 1 line
1.6.2.3