From 6eb16b763e765d5ee6c8e55f77922124949a63ab Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 31 Jan 2006 18:33:37 -0800
Subject: [PATCH] --- yaml --- r: 21351 b: refs/heads/master c:
 a8b900d801697609d1b56cc9c110148c64678068 h: refs/heads/master i:   21349:
 05e4fada0dbe5447f3abaf5f0ef2f56daeab29e2   21347:
 efb840c39b1980c3559597a79d4425693dc9eb21   21343:
 0d269c48ddd4df1e02f1b7e0903aa4e2fb0c5758 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/sparc64/kernel/head.S    |  2 +-
 trunk/arch/sparc64/mm/init.c        | 11 ++---------
 trunk/include/asm-sparc64/cpudata.h |  1 +
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 5abfe4631fb4..b8a85880e51b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3487d1d4414fbfab5d98ec559e6f84f55520cb15
+refs/heads/master: a8b900d801697609d1b56cc9c110148c64678068
diff --git a/trunk/arch/sparc64/kernel/head.S b/trunk/arch/sparc64/kernel/head.S
index 82ce5bced9c7..2988be85147c 100644
--- a/trunk/arch/sparc64/kernel/head.S
+++ b/trunk/arch/sparc64/kernel/head.S
@@ -454,7 +454,7 @@ setup_trap_table:
 	 restore
 
 	.globl	setup_tba
-setup_tba:	/* i0 = is_starfire */
+setup_tba:
 	save	%sp, -192, %sp
 
 	/* The boot processor is the only cpu which invokes this
diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
index f4d22ccb4cf0..20e7af552ce4 100644
--- a/trunk/arch/sparc64/mm/init.c
+++ b/trunk/arch/sparc64/mm/init.c
@@ -1092,15 +1092,8 @@ void __init paging_init(void)
 	
 	inherit_prom_mappings();
 	
-	/* Ok, we can use our TLB miss and window trap handlers safely.
-	 * We need to do a quick peek here to see if we are on StarFire
-	 * or not, so setup_tba can setup the IRQ globals correctly (it
-	 * needs to get the hard smp processor id correctly).
-	 */
-	{
-		extern void setup_tba(int);
-		setup_tba(this_is_starfire);
-	}
+	/* Ok, we can use our TLB miss and window trap handlers safely.  */
+	setup_tba();
 
 	__flush_tlb_all();
 
diff --git a/trunk/include/asm-sparc64/cpudata.h b/trunk/include/asm-sparc64/cpudata.h
index 6c57cbb9a7d1..16d628913837 100644
--- a/trunk/include/asm-sparc64/cpudata.h
+++ b/trunk/include/asm-sparc64/cpudata.h
@@ -61,6 +61,7 @@ struct trap_per_cpu {
 extern struct trap_per_cpu trap_block[NR_CPUS];
 extern void init_cur_cpu_trap(void);
 extern void per_cpu_patch(void);
+extern void setup_tba(void);
 
 #endif /* !(__ASSEMBLY__) */