diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
| commit | 6de9c70882ecdee63a652d493bf2353963bd4c22 (patch) | |
| tree | 9d219e705492331c97f5f7dccce3b0b1a29251bf /arch/x86/kernel/setup_percpu.c | |
| parent | d406d21d90dce2e66c7eb4a44605aac947fe55fb (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.gz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.xz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.zip | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index f7745f94c00..76e305e064f 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -80,24 +80,6 @@ static void __init setup_per_cpu_maps(void) #endif } -#ifdef CONFIG_HAVE_CPUMASK_OF_CPU_MAP -cpumask_t *cpumask_of_cpu_map __read_mostly; -EXPORT_SYMBOL(cpumask_of_cpu_map); - -/* requires nr_cpu_ids to be initialized */ -static void __init setup_cpumask_of_cpu(void) -{ - int i; - - /* alloc_bootmem zeroes memory */ - cpumask_of_cpu_map = alloc_bootmem_low(sizeof(cpumask_t) * nr_cpu_ids); - for (i = 0; i < nr_cpu_ids; i++) - cpu_set(i, cpumask_of_cpu_map[i]); -} -#else -static inline void setup_cpumask_of_cpu(void) { } -#endif - #ifdef CONFIG_X86_32 /* * Great future not-so-futuristic plan: make i386 and x86_64 do it @@ -197,9 +179,6 @@ void __init setup_per_cpu_areas(void) /* Setup node to cpumask map */ setup_node_to_cpumask_map(); - - /* Setup cpumask_of_cpu map */ - setup_cpumask_of_cpu(); } #endif |