diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-31 02:38:21 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-31 02:38:21 +0300 |
commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /arch/powerpc/kernel/ppc_ksyms.c | |
parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
download | linux-e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4.tar.xz |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/powerpc/kernel/ppc_ksyms.c')
-rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 8edc2359c419..260089dccfb0 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -68,7 +68,7 @@ EXPORT_SYMBOL(single_step_exception); EXPORT_SYMBOL(sys_sigreturn); #endif -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER EXPORT_SYMBOL(_mcount); #endif |