Re: [patch 08/11] Text Edit Lock - kprobes i386

Ananth N Mavinakayanahalli
2007-09-18T16:42:16Z

On Mon, Sep 17, 2007 at 02:40:39PM -0400, Mathieu Desnoyers wrote:
> Make kprobes use text_set instead of text_poke.
>
> 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: prasanna@in.ibm.com
> CC: ananth@in.ibm.com
> CC: anil.s.keshavamurthy@intel.com
> CC: davem@davemloft.net
> ---
> arch/i386/kernel/kprobes.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> Index: linux-2.6-lttng/arch/i386/kernel/kprobes.c
> ===================================================================
> --- linux-2.6-lttng.orig/arch/i386/kernel/kprobes.c 2007-09-11 15:47:50.000000000 -0400
> +++ linux-2.6-lttng/arch/i386/kernel/kprobes.c 2007-09-11 15:48:52.000000000 -0400
> @@ -177,12 +177,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