summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2009-04-06 04:40:45 +0000
committerPaul Mackerras <paulus@samba.org>2009-04-07 15:19:00 +1000
commitf4952f6cbeb025bc90906b740dc495f4817266d6 (patch)
tree304a3618e18bd9da75640a31c73d3b11eb648065 /arch
parentbc826666e4252f78d2b144af3b7d699ff5efce0a (diff)
downloadlinux-3.10-f4952f6cbeb025bc90906b740dc495f4817266d6.tar.gz
linux-3.10-f4952f6cbeb025bc90906b740dc495f4817266d6.tar.bz2
linux-3.10-f4952f6cbeb025bc90906b740dc495f4817266d6.zip
powerpc/ftrace: Fix #if that should be #ifdef
Commit bb7253403f7a4670a128e4c080fd8ea1bd4d5029 ("powerpc64, ftrace: save toc only on modules for function graph"), added an #if CONFIG_PPC64. This changes it to #ifdef. Fixes the following warning on 32-bit builds: arch/powerpc/kernel/ftrace.c:562:5: error: "CONFIG_PPC64" is not defined Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 5455943f16a..c2b90a941f7 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -564,7 +564,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
if (unlikely(atomic_read(&current->tracing_graph_pause)))
return;
-#if CONFIG_PPC64
+#ifdef CONFIG_PPC64
/* non core kernel code needs to save and restore the TOC */
if (REGION_ID(self_addr) != KERNEL_REGION_ID)
return_hooker = (unsigned long)&mod_return_to_handler;