From 02be9196bdc8c7216ed24394a23051d2f92a2b26 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 28 Jun 2006 13:18:53 +1000
Subject: [PATCH] --- yaml --- r: 31199 b: refs/heads/master c:
 33dbcf72f607f5da791402e161feaf1ccf5d5be4 h: refs/heads/master i:   31197:
 bbe774b12df0d3ebc9fcc832bec214d7ce455624   31195:
 8db086094553624e98674b25c89d3bc9e83ae284   31191:
 fa09d64cbde2f33d787d97dd492d75f00dd40f3a   31183:
 06dbcd1ffdd1f12f97026d932967cdfa56146247   31167:
 702dce64c8024f295885f04936420416f4380cd6 v: v3

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

diff --git a/[refs] b/[refs]
index f688fdf7df86..95e943c837ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: feb76c7b23fb660f015583359a4c75a1139c0d36
+refs/heads/master: 33dbcf72f607f5da791402e161feaf1ccf5d5be4
diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
index f2fab687a01c..8cfd040d1f50 100644
--- a/trunk/arch/powerpc/kernel/head_64.S
+++ b/trunk/arch/powerpc/kernel/head_64.S
@@ -1583,9 +1583,6 @@ _GLOBAL(__start_initialization_multiplatform)
 	/* Setup some critical 970 SPRs before switching MMU off */
 	bl	.__970_cpu_preinit
 
-	/* cpu # */
-	li	r24,0
-
 	/* Switch off MMU if not already */
 	LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)
 	add	r4,r4,r30
@@ -1946,14 +1943,6 @@ _STATIC(start_here_common)
 	li	r3,0
 	bl	.do_cpu_ftr_fixups
 
-	LOAD_REG_IMMEDIATE(r26, boot_cpuid)
-	lwz	r26,0(r26)
-
-	LOAD_REG_IMMEDIATE(r24, paca)	/* Get base vaddr of paca array  */
-	mulli	r13,r26,PACA_SIZE	/* Calculate vaddr of right paca */
-	add	r13,r13,r24		/* for this processor.		 */
-	mtspr	SPRN_SPRG3,r13
-
 	/* ptr to current */
 	LOAD_REG_IMMEDIATE(r4, init_task)
 	std	r4,PACACURRENT(r13)
diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c
index a2fb2e627aad..175539c9afa0 100644
--- a/trunk/arch/powerpc/kernel/setup_64.c
+++ b/trunk/arch/powerpc/kernel/setup_64.c
@@ -177,6 +177,9 @@ void __init setup_paca(int cpu)
 
 void __init early_setup(unsigned long dt_ptr)
 {
+	/* Assume we're on cpu 0 for now. Don't write to the paca yet! */
+	setup_paca(0);
+
 	/* Enable early debugging if any specified (see udbg.h) */
 	udbg_early_init();