From 583c48764d1f6d5343ccfd10c07d55663f01d5ad Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Mon, 4 Mar 2013 19:45:50 +0000
Subject: [PATCH] --- yaml --- r: 360839 b: refs/heads/master c:
 57d231678ace658b3a73a0d144cfebbd4257bc0e h: refs/heads/master i:   360837:
 78e494eeb70e38c5a6b333f42392710d5d12efc4   360835:
 43dc08d777281f8b365773d5b63e4c8df316a11f   360831:
 78cef9fb30e0b6908e372fc3d4b6f64c004e3ef8 v: v3

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

diff --git a/[refs] b/[refs]
index 1e8b1740d90a..664580d8e61a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8170a83f15eeca9a84ff895f1a89b58918425a3f
+refs/heads/master: 57d231678ace658b3a73a0d144cfebbd4257bc0e
diff --git a/trunk/arch/powerpc/kernel/cpu_setup_power.S b/trunk/arch/powerpc/kernel/cpu_setup_power.S
index d29facbf9a28..bb2d2034d61f 100644
--- a/trunk/arch/powerpc/kernel/cpu_setup_power.S
+++ b/trunk/arch/powerpc/kernel/cpu_setup_power.S
@@ -48,6 +48,7 @@ _GLOBAL(__restore_cpu_power7)
 
 _GLOBAL(__setup_cpu_power8)
 	mflr	r11
+	bl	__init_FSCR
 	bl	__init_hvmode_206
 	mtlr	r11
 	beqlr
@@ -56,13 +57,13 @@ _GLOBAL(__setup_cpu_power8)
 	mfspr	r3,SPRN_LPCR
 	oris	r3, r3, LPCR_AIL_3@h
 	bl	__init_LPCR
-	bl	__init_FSCR
 	bl	__init_TLB
 	mtlr	r11
 	blr
 
 _GLOBAL(__restore_cpu_power8)
 	mflr	r11
+	bl	__init_FSCR
 	mfmsr	r3
 	rldicl.	r0,r3,4,63
 	beqlr