Make kprobes use INIT_ARRAY(). Signed-off-by: Mathieu Desnoyers Tested-by: Ananth N Mavinakayanahalli CC: Andi Kleen CC: ananth@in.ibm.com CC: anil.s.keshavamurthy@intel.com CC: davem@davemloft.net CC: Thomas Gleixner CC: Ingo Molnar CC: H. Peter Anvin --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/