aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/cpumask.h3
-rw-r--r--init/main.c5
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index c0ab3588129d..dbb8367ecf56 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -332,9 +332,6 @@ static inline const struct cpumask *get_cpu_mask(unsigned int cpu)
332 [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \ 332 [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \
333} } 333} }
334 334
335/* cpu_mask_all is in init/main.c */
336extern cpumask_t cpu_mask_all;
337
338#endif 335#endif
339 336
340#define CPU_MASK_NONE \ 337#define CPU_MASK_NONE \
diff --git a/init/main.c b/init/main.c
index 6107223124e4..51695cee1864 100644
--- a/init/main.c
+++ b/init/main.c
@@ -360,11 +360,6 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
360 360
361#else 361#else
362 362
363#if NR_CPUS > BITS_PER_LONG
364cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL;
365EXPORT_SYMBOL(cpu_mask_all);
366#endif
367
368/* Setup number of possible processor ids */ 363/* Setup number of possible processor ids */
369int nr_cpu_ids __read_mostly = NR_CPUS; 364int nr_cpu_ids __read_mostly = NR_CPUS;
370EXPORT_SYMBOL(nr_cpu_ids); 365EXPORT_SYMBOL(nr_cpu_ids);