From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 10 Jan 2009 22:56:42 +0000 (+0100)
Subject: Merge branch 'linus' into x86/cleanups
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1de8cd3cb9f61e854e743c7210df43db517d4832;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/cleanups
---

1de8cd3cb9f61e854e743c7210df43db517d4832
diff --cc arch/x86/include/asm/smp.h
index 74ad9ef6ae0,19953df61c5..1963e27673c
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -18,10 -18,30 +18,27 @@@
  #include <asm/pda.h>
  #include <asm/thread_info.h>
  
+ #ifdef CONFIG_X86_64
+ 
+ extern cpumask_var_t cpu_callin_mask;
+ extern cpumask_var_t cpu_callout_mask;
+ extern cpumask_var_t cpu_initialized_mask;
+ extern cpumask_var_t cpu_sibling_setup_mask;
+ 
+ #else /* CONFIG_X86_32 */
+ 
+ extern cpumask_t cpu_callin_map;
  extern cpumask_t cpu_callout_map;
  extern cpumask_t cpu_initialized;
- extern cpumask_t cpu_callin_map;
+ extern cpumask_t cpu_sibling_setup_map;
+ 
+ #define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
+ #define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
+ #define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)
+ #define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
+ 
+ #endif /* CONFIG_X86_32 */
  
 -extern void (*mtrr_hook)(void);
 -extern void zap_low_mappings(void);
 -
  extern int __cpuinit get_local_pda(int cpu);
  
  extern int smp_num_siblings;
@@@ -144,8 -175,12 +170,8 @@@ void smp_store_cpu_info(int id)
  /* We don't mark CPUs online until __cpu_up(), so we need another measure */
  static inline int num_booting_cpus(void)
  {
- 	return cpus_weight(cpu_callout_map);
+ 	return cpumask_weight(cpu_callout_mask);
  }
 -#else
 -static inline void prefill_possible_map(void)
 -{
 -}
  #endif /* CONFIG_SMP */
  
  extern unsigned disabled_cpus __cpuinitdata;