From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 11:01:51 +0000 (+0100)
Subject: Merge branch 'linus' into core/percpu
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3ddeb51d9c83931c1ca6abf76a38934c5a1ed918;p=deliverable%2Flinux.git

Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c
---

3ddeb51d9c83931c1ca6abf76a38934c5a1ed918
diff --cc arch/x86/kernel/setup_percpu.c
index 90b8e154bb53,01161077a49c..e553803cd2db
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@@ -77,26 -50,7 +77,26 @@@ static void __init setup_node_to_cpumas
  static inline void setup_node_to_cpumask_map(void) { }
  #endif
  
 -#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_X86_SMP)
 +#ifdef CONFIG_X86_64
 +
 +/* correctly size the local cpu masks */
- static void setup_cpu_local_masks(void)
++static void __init setup_cpu_local_masks(void)
 +{
 +	alloc_bootmem_cpumask_var(&cpu_initialized_mask);
 +	alloc_bootmem_cpumask_var(&cpu_callin_mask);
 +	alloc_bootmem_cpumask_var(&cpu_callout_mask);
 +	alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
 +}
 +
 +#else /* CONFIG_X86_32 */
 +
 +static inline void setup_cpu_local_masks(void)
 +{
 +}
 +
 +#endif /* CONFIG_X86_32 */
 +
 +#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA
  /*
   * Copy data used in early init routines from the initial arrays to the
   * per cpu data areas.  These arrays then become expendable and the