[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4785F6A1.5020202@redhat.com>
Date: Thu, 10 Jan 2008 05:42:41 -0500
From: Masami Hiramatsu <mhiramat@...hat.com>
To: Harvey Harrison <harvey.harrison@...il.com>
CC: Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org>,
Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>,
Ananth N Mavinakayanahalli <ananth@...ibm.com>,
Jim Keniston <jkenisto@...ibm.com>
Subject: Re: [PATCH] x86: trivial whitespace in kprobes.c
Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@...il.com>
Acked-by: Masami Hiramatsu <mhiramat@...hat.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@...hat.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@...hat.com, masami.hiramatsu.pt@...achi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists