From a06e7a5e016be7433136dee0a40d13e580adebb8 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Sat, 7 Feb 2009 20:22:40 +0000
Subject: [PATCH] --- yaml --- r: 131221 b: refs/heads/master c:
 f25f9074c24f1451a74942c4bc089bb53e47f462 h: refs/heads/master i:   131219:
 5e733365059463c59de6641136b299f06ee88cdb v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kernel/ftrace.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c468996470a..631e0f8b5dec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eef336189b2b5ae68bfbef0df24176a4a152d981
+refs/heads/master: f25f9074c24f1451a74942c4bc089bb53e47f462
diff --git a/trunk/arch/powerpc/kernel/ftrace.c b/trunk/arch/powerpc/kernel/ftrace.c
index 5355244c99ff..60c60ccf5e3c 100644
--- a/trunk/arch/powerpc/kernel/ftrace.c
+++ b/trunk/arch/powerpc/kernel/ftrace.c
@@ -195,8 +195,9 @@ __ftrace_make_nop(struct module *mod,
 		return -EINVAL;
 	}
 
-	offset = (unsigned)((unsigned short)jmp[0]) << 16 |
-		(unsigned)((unsigned short)jmp[1]);
+	/* The bottom half is signed extended */
+	offset = ((unsigned)((unsigned short)jmp[0]) << 16) +
+		(int)((short)jmp[1]);
 
 	DEBUGP(" %x ", offset);