From 34fb1b4b975452a32f396ba96bb1a222556eebc9 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 25 May 2012 21:20:08 +0000
Subject: [PATCH] --- yaml --- r: 309525 b: refs/heads/master c:
 4efb55e6916628fde549b0ef1c2830593ccf19c4 h: refs/heads/master i:   309523:
 cf7e856bc2a1054f488d09ea29bedd209c69fd2b v: v3

---
 [refs]                             |  2 +-
 trunk/arch/sparc/kernel/head_32.S  | 10 ++--------
 trunk/arch/sparc/kernel/kernel.h   |  3 +++
 trunk/arch/sparc/kernel/setup_32.c | 10 ++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 39fe03ead6e2..31d4b30c577a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30005efc9818d715cc72f15e962d06457c529783
+refs/heads/master: 4efb55e6916628fde549b0ef1c2830593ccf19c4
diff --git a/trunk/arch/sparc/kernel/head_32.S b/trunk/arch/sparc/kernel/head_32.S
index f22a729dfb3d..6c6b8c27c1b8 100644
--- a/trunk/arch/sparc/kernel/head_32.S
+++ b/trunk/arch/sparc/kernel/head_32.S
@@ -661,16 +661,10 @@ continue_boot:
 		wr	%g3, PSR_ET, %psr
 		WRITE_PAUSE
 
-		/* First we call prom_init() to set up PROMLIB, then
-		 * off to start_kernel().
-		 */
-
+		/* Call sparc32_start_kernel(struct linux_romvec *rp) */
 		sethi	%hi(prom_vector_p), %g5
 		ld	[%g5 + %lo(prom_vector_p)], %o0
-		call	prom_init
-		 nop
-
-		call	start_kernel
+		call	sparc32_start_kernel
 		 nop
 
 		/* We should not get here. */
diff --git a/trunk/arch/sparc/kernel/kernel.h b/trunk/arch/sparc/kernel/kernel.h
index a86372d34587..291bb5de9ce0 100644
--- a/trunk/arch/sparc/kernel/kernel.h
+++ b/trunk/arch/sparc/kernel/kernel.h
@@ -26,6 +26,9 @@ static inline unsigned long kimage_addr_to_ra(const char *p)
 #endif
 
 #ifdef CONFIG_SPARC32
+/* setup_32.c */
+void sparc32_start_kernel(struct linux_romvec *rp);
+
 /* cpu.c */
 extern void cpu_probe(void);
 
diff --git a/trunk/arch/sparc/kernel/setup_32.c b/trunk/arch/sparc/kernel/setup_32.c
index c052313f4dc5..68dd63dea36f 100644
--- a/trunk/arch/sparc/kernel/setup_32.c
+++ b/trunk/arch/sparc/kernel/setup_32.c
@@ -32,6 +32,7 @@
 #include <linux/cpu.h>
 #include <linux/kdebug.h>
 #include <linux/export.h>
+#include <linux/start_kernel.h>
 
 #include <asm/io.h>
 #include <asm/processor.h>
@@ -244,6 +245,15 @@ struct tt_entry *sparc_ttable;
 
 struct pt_regs fake_swapper_regs;
 
+/* Called from head_32.S - before we have setup anything
+ * in the kernel. Be very careful with what you do here.
+ */
+void __init sparc32_start_kernel(struct linux_romvec *rp)
+{
+	prom_init(rp);
+	start_kernel();
+}
+
 void __init setup_arch(char **cmdline_p)
 {
 	int i;