From: Steven Rostedt <srostedt@redhat.com>
To: Michael Ellerman <michael@ellerman.id.au>
Cc: linuxppc-dev@ozlabs.org, Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [PATCH 1/2] powerpc/ftrace: Fix #if that should be #ifdef
Date: Mon, 06 Apr 2009 10:45:52 -0400 [thread overview]
Message-ID: <1239029152.4753.2.camel@localhost.localdomain> (raw)
In-Reply-To: <db258c8de9d950c23d61abdcd121361a7bb40f75.1239028836.git.michael@ellerman.id.au>
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(¤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;
next prev parent reply other threads:[~2009-04-06 14:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 14:40 [PATCH 1/2] powerpc/ftrace: Fix #if that should be #ifdef Michael Ellerman
2009-04-06 14:40 ` [PATCH 2/2] powerpc/ftrace: Fix printf format warning Michael Ellerman
2009-04-06 14:46 ` Steven Rostedt
2009-04-06 14:45 ` Steven Rostedt [this message]
2009-04-06 14:59 ` [PATCH 1/2] powerpc/ftrace: Fix #if that should be #ifdef Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1239029152.4753.2.camel@localhost.localdomain \
--to=srostedt@redhat.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.