lkml.org 
[lkml]   [2009]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC PATCH 1/6] jump label v3 - kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE
    Change RELATIVEJUMP_INSTRUCTION macro to RELATIVEJUMP_OPCODE since it
    represents just the opcode byte.


    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    ---
    arch/x86/include/asm/kprobes.h | 2 +-
    arch/x86/kernel/kprobes.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
    index 4fe681d..eaec8ea 100644
    --- a/arch/x86/include/asm/kprobes.h
    +++ b/arch/x86/include/asm/kprobes.h
    @@ -32,7 +32,7 @@ struct kprobe;

    typedef u8 kprobe_opcode_t;
    #define BREAKPOINT_INSTRUCTION 0xcc
    -#define RELATIVEJUMP_INSTRUCTION 0xe9
    +#define RELATIVEJUMP_OPCODE 0xe9
    #define MAX_INSN_SIZE 16
    #define MAX_STACK_SIZE 64
    #define MIN_STACK_SIZE(ADDR) \
    diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
    index 1f3186c..b6b75f1 100644
    --- a/arch/x86/kernel/kprobes.c
    +++ b/arch/x86/kernel/kprobes.c
    @@ -115,7 +115,7 @@ static void __kprobes set_jmp_op(void *from, void *to)
    } __attribute__((packed)) * jop;
    jop = (struct __arch_jmp_op *)from;
    jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
    - jop->op = RELATIVEJUMP_INSTRUCTION;
    + jop->op = RELATIVEJUMP_OPCODE;
    }

    /*
    --
    1.6.5.1


    \
     
     \ /
      Last update: 2009-11-18 23:47    [W:0.020 / U:92.264 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site