Commit 97f7ccbd authored by Greg Banks's avatar Greg Banks Committed by Linus Torvalds

[PATCH] oprofile: fix ia64 callgraph bug with old gcc

With Keith Owens <kaos@sgi.com>

This patch from Keith Owens fixes a bug in the ia64 port of oprofile when
built without the kdb patch and with a pre-3.4 gcc.

If you build a standard kernel with gcc < 3.4 then
ia64_spinlock_contention_pre3_4 is defined.  But a standard kernel does not
have ia64_spinlock_contention_pre3_4_end, that label is only added by the
kdb patch.  To get the backtrace profiling with gcc < 3.4, the _end label
needs to be added as part of the kernprof patch, then I will remove it from
kdb.
Signed-off-by: default avatarKeith Owens <kaos@sgi.com>
Signed-off-by: default avatarGreg Banks <gnb@melbourne.sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a363b379
...@@ -949,6 +949,8 @@ GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4) ...@@ -949,6 +949,8 @@ GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
(p14) br.cond.sptk.few .wait (p14) br.cond.sptk.few .wait
(p15) rsm psr.i // disable interrupts if we reenabled them (p15) rsm psr.i // disable interrupts if we reenabled them
br.cond.sptk.few b6 // lock is now free, try to acquire br.cond.sptk.few b6 // lock is now free, try to acquire
.global ia64_spinlock_contention_pre3_4_end // for kernprof
ia64_spinlock_contention_pre3_4_end:
END(ia64_spinlock_contention_pre3_4) END(ia64_spinlock_contention_pre3_4)
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment