Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / x86 / kernel / kprobes / opt.c

diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index 282b4eb67e30366167102fb1ecd268f59e6a769b..9d4aedece363cc28c696be0dbfa1af8deaba9fa3 100644 (file)
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -422,7 +422,7 @@ err:
 void arch_optimize_kprobes(struct list_head *oplist)
 {
        struct optimized_kprobe *op, *tmp;
-       u8 insn_buf[RELATIVEJUMP_SIZE];
+       u8 insn_buff[RELATIVEJUMP_SIZE];
 
        list_for_each_entry_safe(op, tmp, oplist, list) {
                s32 rel = (s32)((long)op->optinsn.insn -
@@ -434,10 +434,10 @@ void arch_optimize_kprobes(struct list_head *oplist)
                memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
                       RELATIVE_ADDR_SIZE);
 
-               insn_buf[0] = RELATIVEJUMP_OPCODE;
-               *(s32 *)(&insn_buf[1]) = rel;
+               insn_buff[0] = RELATIVEJUMP_OPCODE;
+               *(s32 *)(&insn_buff[1]) = rel;
 
-               text_poke_bp(op->kp.addr, insn_buf, RELATIVEJUMP_SIZE,
+               text_poke_bp(op->kp.addr, insn_buff, RELATIVEJUMP_SIZE,
                             op->optinsn.insn);
 
                list_del_init(&op->list);
@@ -447,12 +447,12 @@ void arch_optimize_kprobes(struct list_head *oplist)
 /* Replace a relative jump with a breakpoint (int3).  */
 void arch_unoptimize_kprobe(struct optimized_kprobe *op)
 {
-       u8 insn_buf[RELATIVEJUMP_SIZE];
+       u8 insn_buff[RELATIVEJUMP_SIZE];
 
        /* Set int3 to first byte for kprobes */
-       insn_buf[0] = BREAKPOINT_INSTRUCTION;
-       memcpy(insn_buf + 1, op->optinsn.copied_insn, RELATIVE_ADDR_SIZE);
-       text_poke_bp(op->kp.addr, insn_buf, RELATIVEJUMP_SIZE,
+       insn_buff[0] = BREAKPOINT_INSTRUCTION;
+       memcpy(insn_buff + 1, op->optinsn.copied_insn, RELATIVE_ADDR_SIZE);
+       text_poke_bp(op->kp.addr, insn_buff, RELATIVEJUMP_SIZE,
                     op->optinsn.insn);
 }