From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 11:03:24 +0000 (+0100)
Subject: Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc... 
X-Git-Tag: v2.6.30-rc1~2^2~50^2~52
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4369f1fb7cd4cf777312f43e1cb9aa5504fc4125;p=~shefty%2Frdma-dev.git

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

4369f1fb7cd4cf777312f43e1cb9aa5504fc4125
diff --cc arch/x86/kernel/cpu/common.c
index 99904f288d6,0c766b80d91..652fdc9a757
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -52,6 -52,15 +52,15 @@@ cpumask_var_t cpu_initialized_mask
  /* representing cpus for which sibling maps can be computed */
  cpumask_var_t cpu_sibling_setup_mask;
  
+ /* correctly size the local cpu masks */
 -void setup_cpu_local_masks(void)
++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 */
  
  cpumask_t cpu_callin_map;