From 5379203e1aa3c017c070840c069ca098295628e5 Mon Sep 17 00:00:00 2001
From: Satoshi Oshima <soshima@redhat.com>
Date: Sat, 20 May 2006 15:00:21 -0700
Subject: [PATCH] --- yaml --- r: 26870 b: refs/heads/master c:
 dc49e3445aa703eb7fd33c7ddb7e4a7bbcf06d30 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/kernel/kprobes.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4356a7c36640..b4d93679efab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be0d03f1c3d3612fe2b6aa451ae87a89382c9231
+refs/heads/master: dc49e3445aa703eb7fd33c7ddb7e4a7bbcf06d30
diff --git a/trunk/arch/x86_64/kernel/kprobes.c b/trunk/arch/x86_64/kernel/kprobes.c
index 1eaa5dae6174..fa1d19ca700a 100644
--- a/trunk/arch/x86_64/kernel/kprobes.c
+++ b/trunk/arch/x86_64/kernel/kprobes.c
@@ -514,13 +514,13 @@ static void __kprobes resume_execution(struct kprobe *p,
 		*tos = orig_rip + (*tos - copy_rip);
 		break;
 	case 0xff:
-		if ((*insn & 0x30) == 0x10) {
+		if ((insn[1] & 0x30) == 0x10) {
 			/* call absolute, indirect */
 			/* Fix return addr; rip is correct. */
 			next_rip = regs->rip;
 			*tos = orig_rip + (*tos - copy_rip);
-		} else if (((*insn & 0x31) == 0x20) ||	/* jmp near, absolute indirect */
-			   ((*insn & 0x31) == 0x21)) {	/* jmp far, absolute indirect */
+		} else if (((insn[1] & 0x31) == 0x20) ||	/* jmp near, absolute indirect */
+			   ((insn[1] & 0x31) == 0x21)) {	/* jmp far, absolute indirect */
 			/* rip is correct. */
 			next_rip = regs->rip;
 		}