Re: [Dle-develop] [PATCH -tip v3&10 01/18] kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE

[Mathieu D. <mat...@ef...>]

* Masami Hiramatsu (mhi...@re...) wrote:
> Change RELATIVEJUMP_INSTRUCTION macro to RELATIVEJUMP_OPCODE since it
> represents just the opcode byte.

Acked-by: Mathieu Desnoyers <mat...@ef...>

> 
> Signed-off-by: Masami Hiramatsu <mhi...@re...>
> Cc: Ananth N Mavinakayanahalli <an...@in...>
> Cc: Ingo Molnar <mi...@el...>
> Cc: Jim Keniston <jke...@us...>
> Cc: Srikar Dronamraju <sr...@li...>
> Cc: Christoph Hellwig <hc...@in...>
> Cc: Steven Rostedt <ro...@go...>
> Cc: Frederic Weisbecker <fwe...@gm...>
> Cc: H. Peter Anvin <hp...@zy...>
> Cc: Anders Kaseorg <an...@ks...>
> Cc: Tim Abbott <ta...@ks...>
> Cc: Andi Kleen <an...@fi...>
> Cc: Jason Baron <jb...@re...>
> Cc: Mathieu Desnoyers <co...@kr...>
> ---
> 
>  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 5de9f4a..15177cd 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;
>  }
>  
>  /*
> 
> 
> -- 
> Masami Hiramatsu
> 
> Software Engineer
> Hitachi Computer Products (America), Inc.
> Software Solutions Division
> 
> e-mail: mhi...@re...
> 

-- 
Mathieu Desnoyers
Operating System Efficiency Consultant
EfficiOS Inc.
http://www.efficios.com