From a8f9d303c2243265cc8202275c4553a9982fb3ab Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Wed, 4 Apr 2012 18:24:29 +0000
Subject: [PATCH] --- yaml --- r: 305336 b: refs/heads/master c:
 823df43552da39fd48a2dd74949363a1c8cf62bb h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/entry_64.S | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fe7955f9929f..1e4c0b4aa98f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d14299dec74a094b0f26b0893eccf8aefdfbd007
+refs/heads/master: 823df43552da39fd48a2dd74949363a1c8cf62bb
diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S
index e212c2f57fd8..7f1e6de9a5a9 100644
--- a/trunk/arch/powerpc/kernel/entry_64.S
+++ b/trunk/arch/powerpc/kernel/entry_64.S
@@ -82,6 +82,7 @@ system_call_common:
 	std	r11,GPR10(r1)
 	std	r11,GPR11(r1)
 	std	r11,GPR12(r1)
+	std	r11,_XER(r1)
 	std	r9,GPR13(r1)
 	mfcr	r9
 	mflr	r10
@@ -89,9 +90,7 @@ system_call_common:
 	std	r9,_CCR(r1)
 	std	r10,_LINK(r1)
 	std	r11,_TRAP(r1)
-	mfxer	r9
 	mfctr	r10
-	std	r9,_XER(r1)
 	std	r10,_CTR(r1)
 	std	r3,ORIG_GPR3(r1)
 	ld	r2,PACATOC(r13)