From 6308bbcd30c1e66915b8fd861dfe710b66938b85 Mon Sep 17 00:00:00 2001
From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Date: Fri, 6 Feb 2009 02:02:00 +0000
Subject: [PATCH] --- yaml --- r: 131220 b: refs/heads/master c:
 eef336189b2b5ae68bfbef0df24176a4a152d981 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/powerpc/lib/sstep.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf132ed3cfe1..2c468996470a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c24b17453c8dc444a746e45b8a404498fc9fcf7
+refs/heads/master: eef336189b2b5ae68bfbef0df24176a4a152d981
diff --git a/trunk/arch/powerpc/lib/sstep.c b/trunk/arch/powerpc/lib/sstep.c
index 4aae0c387645..13b7d54f185b 100644
--- a/trunk/arch/powerpc/lib/sstep.c
+++ b/trunk/arch/powerpc/lib/sstep.c
@@ -172,6 +172,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
 			}
 			break;
 		case 0x378:	/* orx */
+			if (instr & 1)
+				break;
 			rs = (instr >> 21) & 0x1f;
 			rb = (instr >> 11) & 0x1f;
 			if (rs == rb) {		/* mr */