Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d498f763 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

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: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Acked-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Anders Kaseorg <andersk@ksplice.com>
Cc: Tim Abbott <tabbott@ksplice.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Mathieu Desnoyers <compudj@krystal.dyndns.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
LKML-Reference: <20100225133349.6725.99302.stgit@localhost6.localdomain6>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 628ada0c

arch/x86/include/asm/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -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)					       \

arch/x86/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



/*