From 5a24aa18385f132ed9610b68f4d8291aa47dd812 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 6 Apr 2009 04:40:45 +0000 Subject: [PATCH] --- yaml --- r: 142530 b: refs/heads/master c: f4952f6cbeb025bc90906b740dc495f4817266d6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/ftrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bf9a2eb3dc1..d1fea4da8a02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc826666e4252f78d2b144af3b7d699ff5efce0a +refs/heads/master: f4952f6cbeb025bc90906b740dc495f4817266d6 diff --git a/trunk/arch/powerpc/kernel/ftrace.c b/trunk/arch/powerpc/kernel/ftrace.c index 5455943f16aa..c2b90a941f77 100644 --- a/trunk/arch/powerpc/kernel/ftrace.c +++ b/trunk/arch/powerpc/kernel/ftrace.c @@ -564,7 +564,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) if (unlikely(atomic_read(¤t->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;