aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index bfe4fb0c9842..6441083f8273 100644
--- a/init/main.c
+++ b/init/main.c
@@ -136,14 +136,14 @@ unsigned int __initdata setup_max_cpus = NR_CPUS;
136 * greater than 0, limits the maximum number of CPUs activated in 136 * greater than 0, limits the maximum number of CPUs activated in
137 * SMP mode to <NUM>. 137 * SMP mode to <NUM>.
138 */ 138 */
139#ifndef CONFIG_X86_IO_APIC 139
140static inline void disable_ioapic_setup(void) {}; 140void __weak arch_disable_smp_support(void) { }
141#endif
142 141
143static int __init nosmp(char *str) 142static int __init nosmp(char *str)
144{ 143{
145 setup_max_cpus = 0; 144 setup_max_cpus = 0;
146 disable_ioapic_setup(); 145 arch_disable_smp_support();
146
147 return 0; 147 return 0;
148} 148}
149 149
@@ -153,14 +153,14 @@ static int __init maxcpus(char *str)
153{ 153{
154 get_option(&str, &setup_max_cpus); 154 get_option(&str, &setup_max_cpus);
155 if (setup_max_cpus == 0) 155 if (setup_max_cpus == 0)
156 disable_ioapic_setup(); 156 arch_disable_smp_support();
157 157
158 return 0; 158 return 0;
159} 159}
160 160
161early_param("maxcpus", maxcpus); 161early_param("maxcpus", maxcpus);
162#else 162#else
163#define setup_max_cpus NR_CPUS 163const unsigned int setup_max_cpus = NR_CPUS;
164#endif 164#endif
165 165
166/* 166/*