summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/i386_ksyms_32.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-14 08:10:31 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 22:36:24 +0200
commit37135677e653537ffc6e7def679443272a1c03c3 (patch)
tree13ca182dfe446cefc60f8cf5e91b59a43b3170f7 /arch/x86/kernel/i386_ksyms_32.c
parentd05f5f9906740474eb768823004ffcd775b12ca6 (diff)
downloadblackbird-op-linux-37135677e653537ffc6e7def679443272a1c03c3.tar.gz
blackbird-op-linux-37135677e653537ffc6e7def679443272a1c03c3.zip
ftrace: fix mcount export bug
David S. Miller noticed the following bug: the -pg instrumentation function callback is named differently on each platform. On x86 it is mcount, on sparc it is _mcount. So the export does not make sense in kernel/trace/ftrace.c - move it to x86. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/i386_ksyms_32.c')
-rw-r--r--arch/x86/kernel/i386_ksyms_32.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index deb43785e923..29999dbb754c 100644
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -1,7 +1,14 @@
+#include <linux/ftrace.h>
#include <linux/module.h>
+
#include <asm/checksum.h>
-#include <asm/desc.h>
#include <asm/pgtable.h>
+#include <asm/desc.h>
+
+#ifdef CONFIG_FTRACE
+/* mcount is defined in assembly */
+EXPORT_SYMBOL(mcount);
+#endif
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy_generic);
OpenPOWER on IntegriCloud