[patch 09/24] Text Edit Lock - kprobes x86_64

2007-12-20 Thread Mathieu Desnoyers
Make kprobes use INIT_ARRAY().

Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
Tested-by: Ananth N Mavinakayanahalli <[EMAIL PROTECTED]>
CC: Andi Kleen <[EMAIL PROTECTED]>
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: Thomas Gleixner <[EMAIL PROTECTED]>
CC: Ingo Molnar <[EMAIL PROTECTED]>
CC: H. Peter Anvin <[EMAIL PROTECTED]>
---
 arch/x86/kernel/kprobes_64.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6-lttng/arch/x86/kernel/kprobes_64.c
===
--- linux-2.6-lttng.orig/arch/x86/kernel/kprobes_64.c   2007-11-13 
09:45:35.0 -0500
+++ linux-2.6-lttng/arch/x86/kernel/kprobes_64.c2007-11-13 
09:45:46.0 -0500
@@ -215,12 +215,13 @@ static void __kprobes arch_copy_kprobe(s
 
 void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
-   text_poke(p->addr, ((unsigned char []){BREAKPOINT_INSTRUCTION}), 1);
+   text_poke(p->addr, INIT_ARRAY(unsigned char, BREAKPOINT_INSTRUCTION, 1),
+   1);
 }
 
 void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
-   text_poke(p->addr, >opcode, 1);
+   text_poke(p->addr, INIT_ARRAY(unsigned char, p->opcode, 1), 1);
 }
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 09/24] Text Edit Lock - kprobes x86_64

2007-12-20 Thread Mathieu Desnoyers
Make kprobes use INIT_ARRAY().

Signed-off-by: Mathieu Desnoyers [EMAIL PROTECTED]
Tested-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
CC: Andi Kleen [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]
CC: Thomas Gleixner [EMAIL PROTECTED]
CC: Ingo Molnar [EMAIL PROTECTED]
CC: H. Peter Anvin [EMAIL PROTECTED]
---
 arch/x86/kernel/kprobes_64.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6-lttng/arch/x86/kernel/kprobes_64.c
===
--- linux-2.6-lttng.orig/arch/x86/kernel/kprobes_64.c   2007-11-13 
09:45:35.0 -0500
+++ linux-2.6-lttng/arch/x86/kernel/kprobes_64.c2007-11-13 
09:45:46.0 -0500
@@ -215,12 +215,13 @@ static void __kprobes arch_copy_kprobe(s
 
 void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
-   text_poke(p-addr, ((unsigned char []){BREAKPOINT_INSTRUCTION}), 1);
+   text_poke(p-addr, INIT_ARRAY(unsigned char, BREAKPOINT_INSTRUCTION, 1),
+   1);
 }
 
 void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
-   text_poke(p-addr, p-opcode, 1);
+   text_poke(p-addr, INIT_ARRAY(unsigned char, p-opcode, 1), 1);
 }
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/