* [GIT PULL] perf fixes
@ 2010-04-03 10:47 Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 1/2] perf: Always build the stub perf_arch_fetch_caller_regs version Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 2/2] perf: Always build the powerpc " Frederic Weisbecker
0 siblings, 2 replies; 3+ messages in thread
From: Frederic Weisbecker @ 2010-04-03 10:47 UTC (permalink / raw)
To: Ingo Molnar
Cc: LKML, Frederic Weisbecker, Michael Ellerman, Peter Zijlstra,
Arnaldo Carvalho de Melo, Paul Mackerras
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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] perf: Always build the stub perf_arch_fetch_caller_regs version
2010-04-03 10:47 [GIT PULL] perf fixes Frederic Weisbecker
@ 2010-04-03 10:47 ` Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 2/2] perf: Always build the powerpc " Frederic Weisbecker
1 sibling, 0 replies; 3+ messages in thread
From: Frederic Weisbecker @ 2010-04-03 10:47 UTC (permalink / raw)
To: Ingo Molnar
Cc: LKML, Frederic Weisbecker, Michael Ellerman, Peter Zijlstra,
Arnaldo Carvalho de Melo, Paul Mackerras
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>
---
kernel/perf_event.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 96aae13..681af80 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
--
1.6.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] perf: Always build the powerpc perf_arch_fetch_caller_regs version
2010-04-03 10:47 [GIT PULL] perf fixes Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 1/2] perf: Always build the stub perf_arch_fetch_caller_regs version Frederic Weisbecker
@ 2010-04-03 10:47 ` Frederic Weisbecker
1 sibling, 0 replies; 3+ messages in thread
From: Frederic Weisbecker @ 2010-04-03 10:47 UTC (permalink / raw)
To: Ingo Molnar
Cc: LKML, Frederic Weisbecker, Michael Ellerman, Peter Zijlstra,
Arnaldo Carvalho de Melo, Paul Mackerras
Now 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
Reported-by: Michael Ellerman <michael@ellerman.id.au>
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>
---
arch/powerpc/kernel/misc.S | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index b485a87..22e507c 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -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 */
--
1.6.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-03 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-03 10:47 [GIT PULL] perf fixes Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 1/2] perf: Always build the stub perf_arch_fetch_caller_regs version Frederic Weisbecker
2010-04-03 10:47 ` [PATCH 2/2] perf: Always build the powerpc " Frederic Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).