Messages in this thread Patch in this message | | | Date | Thu, 24 Jan 2008 15:27:17 -0500 | From | Mathieu Desnoyers <> | Subject | [patch 11/26] Text Edit Lock - kprobes x86 |
| |
Make kprobes use INIT_ARRAY().
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Tested-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> CC: Andi Kleen <andi@firstfloor.org> CC: ananth@in.ibm.com CC: anil.s.keshavamurthy@intel.com CC: davem@davemloft.net CC: Thomas Gleixner <tglx@linutronix.de> CC: Ingo Molnar <mingo@redhat.com> CC: H. Peter Anvin <hpa@zytor.com> --- arch/x86/kernel/kprobes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux-2.6-lttng.mm/arch/x86/kernel/kprobes.c =================================================================== --- linux-2.6-lttng.mm.orig/arch/x86/kernel/kprobes.c 2008-01-24 14:27:04.000000000 -0500 +++ linux-2.6-lttng.mm/arch/x86/kernel/kprobes.c 2008-01-24 14:27:47.000000000 -0500 @@ -366,12 +366,13 @@ int __kprobes arch_prepare_kprobe(struct 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
| |