From db77ecfa91b144acb5e03ec8c566cfa9ab38b1c9 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Wed, 25 Aug 2010 21:04:25 +0000
Subject: [PATCH] --- yaml --- r: 210291 b: refs/heads/master c:
 54a834043314c257210db2a9d59f8cc605571639 h: refs/heads/master i:   210289:
 cda2c8d4e15d7fc308972ba917d6713f40c9e829   210287:
 ea62be3f57069b4209722f0c95f5af54ff72cd4d v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/kernel/head_64.S | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fed9560b712f..f4bdbf75728e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0d278b7d3ae9115939ddcea93f516308cc367e2
+refs/heads/master: 54a834043314c257210db2a9d59f8cc605571639
diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
index 4d6681dce816..c571cd3c1453 100644
--- a/trunk/arch/powerpc/kernel/head_64.S
+++ b/trunk/arch/powerpc/kernel/head_64.S
@@ -575,13 +575,19 @@ __secondary_start:
 	/* Initialize the kernel stack.  Just a repeat for iSeries.	 */
 	LOAD_REG_ADDR(r3, current_set)
 	sldi	r28,r24,3		/* get current_set[cpu#]	 */
-	ldx	r1,r3,r28
-	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
-	std	r1,PACAKSAVE(r13)
+	ldx	r14,r3,r28
+	addi	r14,r14,THREAD_SIZE-STACK_FRAME_OVERHEAD
+	std	r14,PACAKSAVE(r13)
 
 	/* Do early setup for that CPU (stab, slb, hash table pointer) */
 	bl	.early_setup_secondary
 
+	/*
+	 * setup the new stack pointer, but *don't* use this until
+	 * translation is on.
+	 */
+	mr	r1, r14
+
 	/* Clear backchain so we get nice backtraces */
 	li	r7,0
 	mtlr	r7