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

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

[Greg Banks]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

G'day,

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.

Greg.
-- 
Greg Banks, R&D Software Engineer, SGI Australian Software Group.
I don't speak for SGI.


[-- Attachment #2: oprofile-ia64-gcc-pre-34-fix --]
[-- Type: text/plain, Size: 1110 bytes --]

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.  Send this to akpm.

From: Keith Owens <kaos@sgi.com>
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>

Index: linux/arch/ia64/kernel/head.S
===================================================================
--- linux.orig/arch/ia64/kernel/head.S	2004-10-19 07:54:38.000000000 +1000
+++ linux/arch/ia64/kernel/head.S	2005-01-05 20:37:23.000000000 +1100
@@ -949,6 +949,8 @@ GLOBAL_ENTRY(ia64_spinlock_contention_pr
 (p14)	br.cond.sptk.few .wait
 (p15)	rsm psr.i		// disable interrupts if we reenabled them
 	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)
 
 #else