diff options
-rw-r--r-- | arch/powerpc/include/asm/smp.h | 9 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_smp.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/smp.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 2 |
7 files changed, 9 insertions, 13 deletions
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index c25f73d1d842..e782f43ee669 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h | |||
@@ -148,6 +148,15 @@ extern struct smp_ops_t *smp_ops; | |||
148 | extern void arch_send_call_function_single_ipi(int cpu); | 148 | extern void arch_send_call_function_single_ipi(int cpu); |
149 | extern void arch_send_call_function_ipi(cpumask_t mask); | 149 | extern void arch_send_call_function_ipi(cpumask_t mask); |
150 | 150 | ||
151 | /* Definitions relative to the secondary CPU spin loop | ||
152 | * and entry point. Not all of them exist on both 32 and | ||
153 | * 64-bit but defining them all here doesn't harm | ||
154 | */ | ||
155 | extern void generic_secondary_smp_init(void); | ||
156 | extern unsigned long __secondary_hold_spinloop; | ||
157 | extern unsigned long __secondary_hold_acknowledge; | ||
158 | extern char __secondary_hold; | ||
159 | |||
151 | #endif /* __ASSEMBLY__ */ | 160 | #endif /* __ASSEMBLY__ */ |
152 | 161 | ||
153 | #endif /* __KERNEL__ */ | 162 | #endif /* __KERNEL__ */ |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index a538824616fd..d942404779c1 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -1259,10 +1259,6 @@ static void __init prom_initialize_tce_table(void) | |||
1259 | * | 1259 | * |
1260 | * -- Cort | 1260 | * -- Cort |
1261 | */ | 1261 | */ |
1262 | extern char __secondary_hold; | ||
1263 | extern unsigned long __secondary_hold_spinloop; | ||
1264 | extern unsigned long __secondary_hold_acknowledge; | ||
1265 | |||
1266 | /* | 1262 | /* |
1267 | * We want to reference the copy of __secondary_hold_* in the | 1263 | * We want to reference the copy of __secondary_hold_* in the |
1268 | * 0 - 0x100 address range | 1264 | * 0 - 0x100 address range |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 325dc5b2e626..a6b6c4c9ae41 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -230,9 +230,6 @@ void early_setup_secondary(void) | |||
230 | #endif /* CONFIG_SMP */ | 230 | #endif /* CONFIG_SMP */ |
231 | 231 | ||
232 | #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC) | 232 | #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC) |
233 | extern unsigned long __secondary_hold_spinloop; | ||
234 | extern void generic_secondary_smp_init(void); | ||
235 | |||
236 | void smp_release_cpus(void) | 233 | void smp_release_cpus(void) |
237 | { | 234 | { |
238 | unsigned long *ptr; | 235 | unsigned long *ptr; |
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 62c592ede641..9f526ba31c1e 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | #include <sysdev/fsl_soc.h> | 26 | #include <sysdev/fsl_soc.h> |
27 | 27 | ||
28 | extern volatile unsigned long __secondary_hold_acknowledge; | ||
29 | extern void __early_start(void); | 28 | extern void __early_start(void); |
30 | 29 | ||
31 | #define BOOT_ENTRY_ADDR_UPPER 0 | 30 | #define BOOT_ENTRY_ADDR_UPPER 0 |
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c index d84bbb508ee7..eacea0e3fcc8 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include "mpc86xx.h" | 27 | #include "mpc86xx.h" |
28 | 28 | ||
29 | extern void __secondary_start_mpc86xx(void); | 29 | extern void __secondary_start_mpc86xx(void); |
30 | extern unsigned long __secondary_hold_acknowledge; | ||
31 | 30 | ||
32 | #define MCM_PORT_CONFIG_OFFSET 0x10 | 31 | #define MCM_PORT_CONFIG_OFFSET 0x10 |
33 | 32 | ||
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index bc97fada48c6..f774530075b7 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c | |||
@@ -58,8 +58,6 @@ | |||
58 | */ | 58 | */ |
59 | static cpumask_t of_spin_map; | 59 | static cpumask_t of_spin_map; |
60 | 60 | ||
61 | extern void generic_secondary_smp_init(unsigned long); | ||
62 | |||
63 | /** | 61 | /** |
64 | * smp_startup_cpu() - start the given cpu | 62 | * smp_startup_cpu() - start the given cpu |
65 | * | 63 | * |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 1f8f6cfb94f7..440000cc7130 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -56,8 +56,6 @@ | |||
56 | */ | 56 | */ |
57 | static cpumask_t of_spin_map; | 57 | static cpumask_t of_spin_map; |
58 | 58 | ||
59 | extern void generic_secondary_smp_init(unsigned long); | ||
60 | |||
61 | /** | 59 | /** |
62 | * smp_startup_cpu() - start the given cpu | 60 | * smp_startup_cpu() - start the given cpu |
63 | * | 61 | * |