mhiramat at redhat
Nov 23, 2009, 3:21 PM
Post #1 of 1
(43 views)
Permalink
|
|
[PATCH -tip v5 01/10] 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 [at] redhat>
Cc: Ananth N Mavinakayanahalli <ananth [at] in>
Cc: Ingo Molnar <mingo [at] elte>
Cc: Jim Keniston <jkenisto [at] us>
Cc: Srikar Dronamraju <srikar [at] linux>
Cc: Christoph Hellwig <hch [at] infradead>
Cc: Steven Rostedt <rostedt [at] goodmis>
Cc: Frederic Weisbecker <fweisbec [at] gmail>
Cc: H. Peter Anvin <hpa [at] zytor>
Cc: Anders Kaseorg <andersk [at] ksplice>
Cc: Tim Abbott <tabbott [at] ksplice>
Cc: Andi Kleen <andi [at] firstfloor>
Cc: Jason Baron <jbaron [at] redhat>
Cc: Mathieu Desnoyers <mathieu.desnoyers [at] polymtl>
---
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;
}
/*
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division
e-mail: mhiramat [at] redhat
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
|
