From: Masami Hiramatsu <mhiramat@redhat.com>
To: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Jim Keniston <jkenisto@us.ibm.com>
Subject: Re: [PATCH] x86: trivial whitespace in kprobes.c
Date: Thu, 10 Jan 2008 05:42:41 -0500 [thread overview]
Message-ID: <4785F6A1.5020202@redhat.com> (raw)
In-Reply-To: <1199954157.19760.22.camel@brick>
Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
> ---
> Ingo, you could/should probably fold this into Masami's kprobe
> unification patch.
The original code had these whitespace, because (I think)
kretprobe_trampoline_holder() had just hold a memory space
for hooking function return. And now, it has actual code.
So the whitespace can be removed.
Thank you.
>
> commit 17735e04f7f18bea4dcbe4daa31c34acac55b332
> Author: Masami Hiramatsu <mhiramat@redhat.com>
> Date: Wed Jan 9 13:30:50 2008 +0100
>
> kprobes code for x86 unification
>
> in current(ish) x86.git
>
> arch/x86/kernel/kprobes.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
> index 53ba6a5..93aff49 100644
> --- a/arch/x86/kernel/kprobes.c
> +++ b/arch/x86/kernel/kprobes.c
> @@ -583,8 +583,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
> * When a retprobed function returns, this code saves registers and
> * calls trampoline_handler() runs, which calls the kretprobe's handler.
> */
> - void __kprobes kretprobe_trampoline_holder(void)
> - {
> +void __kprobes kretprobe_trampoline_holder(void)
> +{
> asm volatile (
> ".global kretprobe_trampoline\n"
> "kretprobe_trampoline: \n"
> @@ -670,7 +670,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
> " popf\n"
> #endif
> " ret\n");
> - }
> +}
>
> /*
> * Called from kretprobe_trampoline
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division
e-mail: mhiramat@redhat.com, masami.hiramatsu.pt@hitachi.com
next prev parent reply other threads:[~2008-01-10 10:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-10 8:35 [PATCH] x86: trivial whitespace in kprobes.c Harvey Harrison
2008-01-10 10:42 ` Masami Hiramatsu [this message]
2008-01-10 11:06 ` Masami Hiramatsu
2008-01-10 12:44 ` Ingo Molnar
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=4785F6A1.5020202@redhat.com \
--to=mhiramat@redhat.com \
--cc=ananth@in.ibm.com \
--cc=harvey.harrison@gmail.com \
--cc=hpa@zytor.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox