[PATCH] x86: trivial whitespace in kprobes.c

[PATCH] x86: trivial whitespace in kprobes.c

[Harvey Harrison]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Ingo, you could/should probably fold this into Masami's kprobe
unification patch.

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
-- 
1.5.4.rc2.1164.g6451

Re: [PATCH] x86: trivial whitespace in kprobes.c

[Masami Hiramatsu]

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

Re: [PATCH] x86: trivial whitespace in kprobes.c

[Masami Hiramatsu]

Masami Hiramatsu wrote:
> 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.

Hmm, this function still a bit special, because it is not
called directly. kretprobe uses kretprobe_trampoline symbol,
which is defined in this function.
Anyway, I think the whitespace does not help us understand it...

> So the whitespace can be removed.

Thank you,

-- 
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division

e-mail: mhiramat@redhat.com, masami.hiramatsu.pt@hitachi.com

Re: [PATCH] x86: trivial whitespace in kprobes.c

[Ingo Molnar]

* Harvey Harrison <harvey.harrison@gmail.com> wrote:

> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> Ingo, you could/should probably fold this into Masami's kprobe
> unification patch.

i applied this as a separate patch - better for whitespace changes to 
not be mixed into unification patches.

	Ingo