[PATCH 1/2] powerpc/ftrace: Fix #if that should be #ifdef

Steven Rostedt srostedt at redhat.com
Tue Apr 7 00:45:52 EST 2009


Note, I only use my Red Hat email account to acknowledge who pays me to
do the work. But I'm much more reachable at rostedt at goodmis.org (as it
says in the maintainers file). I may go weeks without reading the RH
email.

On Tue, 2009-04-07 at 00:40 +1000, Michael Ellerman wrote:
> Commit bb7253403f7a4670a128e4c080fd8ea1bd4d5029 (powerpc64,
> ftrace: save toc only on modules for function graph), added a
> 
> 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 at ellerman.id.au>

Acked-by: Steven Rostedt <rostedt at goodmis.org>

Hmm, maybe I'll keep the "Git Author" as srostedt at redhat.com, and change
the signature to my goodmis account. Maybe that would be less confusing.

-- Steve

> ---
>  arch/powerpc/kernel/ftrace.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
> index e74f2dd..e9d9d38 100644
> --- a/arch/powerpc/kernel/ftrace.c
> +++ b/arch/powerpc/kernel/ftrace.c
> @@ -559,7 +559,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;




More information about the Linuxppc-dev mailing list