From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 02:00:53 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc1~505
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=502f4d4f74219749a9758b9bbc27fb665b2e83ab;p=linux.git

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix and clean up generic_processor_info()
  x86: Don't copy per_cpu cpuinfo for BSP two times
  x86: Move llc_shared_map out of cpu_info
---

502f4d4f74219749a9758b9bbc27fb665b2e83ab
diff --cc arch/x86/include/asm/smp.h
index c1bbfa89a0e2,bc6f84e11d32..99fa8b47381e
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -22,17 -21,10 +22,19 @@@
  extern int smp_num_siblings;
  extern unsigned int num_processors;
  
 +static inline bool cpu_has_ht_siblings(void)
 +{
 +	bool has_siblings = false;
 +#ifdef CONFIG_SMP
 +	has_siblings = cpu_has_ht && smp_num_siblings > 1;
 +#endif
 +	return has_siblings;
 +}
 +
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
+ /* cpus sharing the last level cache: */
+ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
  DECLARE_PER_CPU(u16, cpu_llc_id);
  DECLARE_PER_CPU(int, cpu_number);