git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
i386_ksyms_32.c
diff --git
a/arch/x86/kernel/i386_ksyms_32.c
b/arch/x86/kernel/i386_ksyms_32.c
index
dd7ebee
..
43cec6b
100644
(file)
--- a/
arch/x86/kernel/i386_ksyms_32.c
+++ b/
arch/x86/kernel/i386_ksyms_32.c
@@
-5,7
+5,7
@@
#include <asm/desc.h>
#include <asm/ftrace.h>
-#ifdef CONFIG_F
TRACE
+#ifdef CONFIG_F
UNCTION_TRACER
/* mcount is defined in assembly */
EXPORT_SYMBOL(mcount);
#endif