From c23baaba8508e03b530374f43aa8f061ee436dc9 Mon Sep 17 00:00:00 2001
From: Jakub Jermar <jakub@jermar.eu>
Date: Fri, 29 Sep 2006 10:18:35 +0000
Subject: [PATCH] Small fixes. The sparc64 kernel now compiles again even if
 not compiled with SMP support.

---
 kernel/arch/sparc64/src/mm/tlb.c | 4 ++--
 kernel/arch/sparc64/src/start.S  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel/arch/sparc64/src/mm/tlb.c b/kernel/arch/sparc64/src/mm/tlb.c
index eae50287c..e0f285321 100644
--- a/kernel/arch/sparc64/src/mm/tlb.c
+++ b/kernel/arch/sparc64/src/mm/tlb.c
@@ -71,9 +71,9 @@ char *context_encoding[] = {
 void tlb_arch_init(void)
 {
 	/*
-	 * TLBs are actually initialized early
-	 * in start.S.
+	 * Invalidate all non-locked DTLB and ITLB entries.
 	 */
+	tlb_invalidate_all();
 }
 
 /** Insert privileged mapping into DMMU TLB.
diff --git a/kernel/arch/sparc64/src/start.S b/kernel/arch/sparc64/src/start.S
index e82dddd2f..5f25eb01c 100644
--- a/kernel/arch/sparc64/src/start.S
+++ b/kernel/arch/sparc64/src/start.S
@@ -80,6 +80,8 @@ kernel_image_start:
 	 * to the kernel bootinfo structure.
 	 */
 	brz %l7, 0f				! skip if you are not the bootstrap CPU
+	nop
+	
 	sethi %hi(bootinfo), %o0
 	call memcpy
 	or %o0, %lo(bootinfo), %o0
@@ -255,6 +257,7 @@ kernel_image_start:
 	srlx %g1, UPA_CONFIG_MID_SHIFT, %g1
 	and %g1, UPA_CONFIG_MID_MASK, %g1
 
+#ifdef CONFIG_SMP
 	/*
 	 * Active loop for APs until the BSP picks them up.
 	 * A processor cannot leave the loop until the
@@ -268,7 +271,7 @@ kernel_image_start:
 	bne 2b
 	nop
 
-#ifdef CONFIG_SMP
+
 	/*
 	 * Configure stack for the AP.
 	 * The AP is expected to use the stack saved
@@ -280,9 +283,9 @@ kernel_image_start:
 
 	call main_ap
 	nop
-#endif
 
 	/* Not reached. */
+#endif
 	
 0:
 	ba 0b
-- 
2.11.4.GIT