From: Ingo Molnar Date: Mon, 30 Mar 2009 21:53:32 +0000 (+0200) Subject: Merge branch 'linus' into cpumask-for-linus X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=65fb0d23fcddd8697c871047b700c78817bdaa43;p=linux-2.6-omap-h63xx.git Merge branch 'linus' into cpumask-for-linus Conflicts: arch/x86/kernel/cpu/common.c --- 65fb0d23fcddd8697c871047b700c78817bdaa43 diff --cc arch/x86/kernel/cpu/common.c index d7dd3c294e2,e2962cc1e27..c4f667896c2 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@@ -29,22 -39,14 +39,12 @@@ #include #endif - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include "cpu.h" -#ifdef CONFIG_X86_64 - /* all of these masks are initialized in setup_cpu_local_masks() */ - cpumask_var_t cpu_callin_mask; - cpumask_var_t cpu_callout_mask; cpumask_var_t cpu_initialized_mask; + cpumask_var_t cpu_callout_mask; + cpumask_var_t cpu_callin_mask; /* representing cpus for which sibling maps can be computed */ cpumask_var_t cpu_sibling_setup_mask; @@@ -58,7 -60,17 +58,7 @@@ void __init setup_cpu_local_masks(void alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); } - static struct cpu_dev *this_cpu __cpuinitdata; -#else /* CONFIG_X86_32 */ - -cpumask_t cpu_sibling_setup_map; -cpumask_t cpu_callout_map; -cpumask_t cpu_initialized; -cpumask_t cpu_callin_map; - -#endif /* CONFIG_X86_32 */ - - + static const struct cpu_dev *this_cpu __cpuinitdata; DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { #ifdef CONFIG_X86_64