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

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

[Michael Ellerman]

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@ellerman.id.au>
---
 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;
-- 
1.6.2.1

[PATCH 2/2] powerpc/ftrace: Fix printf format warning

[Michael Ellerman]

'tramp' is an unsigned long, so print it with %lx.

Fixes the following build warning:
arch/powerpc/kernel/ftrace.c:291: error: format ‘%x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 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 e9d9d38..e1edf5a 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -288,7 +288,7 @@ __ftrace_make_nop(struct module *mod,
 	if (tramp & 0x8000)
 		tramp -= 0x10000;
 
-	pr_debug(" %x ", tramp);
+	pr_debug(" %lx ", tramp);
 
 	if (tramp != addr) {
 		printk(KERN_ERR
-- 
1.6.2.1

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

[Steven Rostedt]

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@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@ellerman.id.au>

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

Hmm, maybe I'll keep the "Git Author" as srostedt@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;

Re: [PATCH 2/2] powerpc/ftrace: Fix printf format warning

[Steven Rostedt]

On Tue, 2009-04-07 at 00:40 +1000, Michael Ellerman wrote:
> 'tramp' is an unsigned long, so print it with %lx.
> 
> Fixes the following build warning:
> arch/powerpc/kernel/ftrace.c:291: error: format ‘%x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’
> 
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

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

-- 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 e9d9d38..e1edf5a 100644
> --- a/arch/powerpc/kernel/ftrace.c
> +++ b/arch/powerpc/kernel/ftrace.c
> @@ -288,7 +288,7 @@ __ftrace_make_nop(struct module *mod,
>  	if (tramp & 0x8000)
>  		tramp -= 0x10000;
>  
> -	pr_debug(" %x ", tramp);
> +	pr_debug(" %lx ", tramp);
>  
>  	if (tramp != addr) {
>  		printk(KERN_ERR

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

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

On Mon, 2009-04-06 at 10:45 -0400, Steven Rostedt wrote:
> 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@ellerman.id.au>
> 
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
> 
> Hmm, maybe I'll keep the "Git Author" as srostedt@redhat.com, and change
> the signature to my goodmis account. Maybe that would be less confusing.

Thanks for the acks.

Yeah I copied the address from your S-O-B, so I'd say that address
should be the one you want mail to go to.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]