Skip to contentSkip to conversation

x86: trivial whitespace in kprobes.c

PATCH In review Harvey Harrison 3 participants 4 messages Jan 10, 2008 x86

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 1/1 x86: trivial whitespace in kprobes.c

Signed-off-by Harvey Harrison <[email protected]>

---
Ingo, you could/should probably fold this into Masami's kprobe unification patch.

commit 17735e04f7f18bea4dcbe4daa31c34acac55b332

Author: Masami Hiramatsu <[email protected]>
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(-)
arch/x86/kernel/kprobes.c +3 -3
index 53ba6a5..93aff49 100644
@@ -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
Signature · 1 line
1.5.4.rc2.1164.g6451
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Harvey Harrison
Signed-off-by Harvey Harrison <[email protected]>
Acked-by Masami Hiramatsu <[email protected]>
Quoted 3 lines

---
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.

Quoted 36 lines

commit 17735e04f7f18bea4dcbe4daa31c34acac55b332

Author: Masami Hiramatsu <[email protected]>
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(-)
arch/x86/kernel/kprobes.c +3 -3
index 53ba6a5..93aff49 100644
@@ -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
Signature · 7 lines
Masami Hiramatsu

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

e-mail: [email protected], [email protected]
#2 lore raw
Quoted 5 lines · Masami Hiramatsu
Quoted 1 line · Harvey Harrison
Signed-off-by Harvey Harrison <[email protected]>
Acked-by Masami Hiramatsu <[email protected]>
Quoted 7 lines
Quoted 3 lines

---
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...

Quoted 1 line

So the whitespace can be removed.

Thank you,

Signature · 7 lines
Masami Hiramatsu

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

e-mail: [email protected], [email protected]