aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-01-31 21:33:37 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 04:11:25 -0500
commita8b900d801697609d1b56cc9c110148c64678068 (patch)
tree47602480aba29d17f8a79cc76dfe8af4d62f2599
parent3487d1d4414fbfab5d98ec559e6f84f55520cb15 (diff)
[SPARC64]: Kill sole argument passed to setup_tba().
No longer used, and move extern declaration to a header file. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/kernel/head.S2
-rw-r--r--arch/sparc64/mm/init.c11
-rw-r--r--include/asm-sparc64/cpudata.h1
3 files changed, 4 insertions, 10 deletions
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 82ce5bced9c7..2988be85147c 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -454,7 +454,7 @@ setup_trap_table:
454 restore 454 restore
455 455
456 .globl setup_tba 456 .globl setup_tba
457setup_tba: /* i0 = is_starfire */ 457setup_tba:
458 save %sp, -192, %sp 458 save %sp, -192, %sp
459 459
460 /* The boot processor is the only cpu which invokes this 460 /* The boot processor is the only cpu which invokes this
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index f4d22ccb4cf0..20e7af552ce4 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1092,15 +1092,8 @@ void __init paging_init(void)
1092 1092
1093 inherit_prom_mappings(); 1093 inherit_prom_mappings();
1094 1094
1095 /* Ok, we can use our TLB miss and window trap handlers safely. 1095 /* Ok, we can use our TLB miss and window trap handlers safely. */
1096 * We need to do a quick peek here to see if we are on StarFire 1096 setup_tba();
1097 * or not, so setup_tba can setup the IRQ globals correctly (it
1098 * needs to get the hard smp processor id correctly).
1099 */
1100 {
1101 extern void setup_tba(int);
1102 setup_tba(this_is_starfire);
1103 }
1104 1097
1105 __flush_tlb_all(); 1098 __flush_tlb_all();
1106 1099
diff --git a/include/asm-sparc64/cpudata.h b/include/asm-sparc64/cpudata.h
index 6c57cbb9a7d1..16d628913837 100644
--- a/include/asm-sparc64/cpudata.h
+++ b/include/asm-sparc64/cpudata.h
@@ -61,6 +61,7 @@ struct trap_per_cpu {
61extern struct trap_per_cpu trap_block[NR_CPUS]; 61extern struct trap_per_cpu trap_block[NR_CPUS];
62extern void init_cur_cpu_trap(void); 62extern void init_cur_cpu_trap(void);
63extern void per_cpu_patch(void); 63extern void per_cpu_patch(void);
64extern void setup_tba(void);
64 65
65#endif /* !(__ASSEMBLY__) */ 66#endif /* !(__ASSEMBLY__) */
66 67