diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2006-08-25 19:22:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-08-26 20:52:56 -0400 |
commit | 5fec811e99bb6f537e67b6bcbe9fe6505aa8a114 (patch) | |
tree | 9c4dcefe198ef7df3283518d3cc1629857aa7604 /arch | |
parent | a23b423ec0573ead85e2c92f2a5df5d4bf47e26b (diff) |
[SPARC]: Small smp cleanup.
It moves the smp_procesors_ready variable to sun4d_smp.c only.
Signed-off-by: Krzysztof Helt (krzysztof.h1@wp.pl)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/smp.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index e311ade1b490..276f22881d0f 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <asm/tlbflush.h> | 34 | #include <asm/tlbflush.h> |
35 | #include <asm/cpudata.h> | 35 | #include <asm/cpudata.h> |
36 | 36 | ||
37 | volatile int smp_processors_ready = 0; | ||
38 | int smp_num_cpus = 1; | 37 | int smp_num_cpus = 1; |
39 | volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; | 38 | volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; |
40 | unsigned char boot_cpu_id = 0; | 39 | unsigned char boot_cpu_id = 0; |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index ba843f6a2832..3ff4edd32815 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -42,7 +42,7 @@ extern ctxd_t *srmmu_ctx_table_phys; | |||
42 | 42 | ||
43 | extern void calibrate_delay(void); | 43 | extern void calibrate_delay(void); |
44 | 44 | ||
45 | extern volatile int smp_processors_ready; | 45 | static volatile int smp_processors_ready = 0; |
46 | static int smp_highest_cpu; | 46 | static int smp_highest_cpu; |
47 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; | 47 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; |
48 | extern cpuinfo_sparc cpu_data[NR_CPUS]; | 48 | extern cpuinfo_sparc cpu_data[NR_CPUS]; |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 3b32096134aa..7d4a649138f6 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -39,7 +39,6 @@ extern ctxd_t *srmmu_ctx_table_phys; | |||
39 | 39 | ||
40 | extern void calibrate_delay(void); | 40 | extern void calibrate_delay(void); |
41 | 41 | ||
42 | extern volatile int smp_processors_ready; | ||
43 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; | 42 | extern volatile unsigned long cpu_callin_map[NR_CPUS]; |
44 | extern unsigned char boot_cpu_id; | 43 | extern unsigned char boot_cpu_id; |
45 | 44 | ||
@@ -217,7 +216,6 @@ void __init smp4m_smp_done(void) | |||
217 | } | 216 | } |
218 | 217 | ||
219 | /* Ok, they are spinning and ready to go. */ | 218 | /* Ok, they are spinning and ready to go. */ |
220 | smp_processors_ready = 1; | ||
221 | } | 219 | } |
222 | 220 | ||
223 | /* At each hardware IRQ, we get this called to forward IRQ reception | 221 | /* At each hardware IRQ, we get this called to forward IRQ reception |