From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Dec 2009 20:36:46 +0000 (-0800)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.33-rc1~277
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=75b08038ceb62f3bd8935346679920f97c3cf9f6;p=linux-block.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: Clean up thermal init by introducing intel_thermal_supported()
  x86, mce: Thermal monitoring depends on APIC being enabled
  x86: Gart: fix breakage due to IOMMU initialization cleanup
  x86: Move swiotlb initialization before dma32_free_bootmem
  x86: Fix build warning in arch/x86/mm/mmio-mod.c
  x86: Remove usedac in feature-removal-schedule.txt
  x86: Fix duplicated UV BAU interrupt vector
  nvram: Fix write beyond end condition; prove to gcc copy is safe
  mm: Adjust do_pages_stat() so gcc can see copy_from_user() is safe
  x86: Limit the number of processor bootup messages
  x86: Remove enabling x2apic message for every CPU
  doc: Add documentation for bootloader_{type,version}
  x86, msr: Add support for non-contiguous cpumasks
  x86: Use find_e820() instead of hard coded trampoline address
  x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks

Trivial percpu-naming-introduced conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c
---

75b08038ceb62f3bd8935346679920f97c3cf9f6
diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
index 0c06bca2a1dc,63ada177b40c..fc6c8ef92dcc
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@@ -511,14 -511,15 +511,15 @@@ static void __cpuinit cache_shared_cpu_
  	struct cpuinfo_x86 *c = &cpu_data(cpu);
  
  	if ((index == 3) && (c->x86_vendor == X86_VENDOR_AMD)) {
- 		struct cpuinfo_x86 *d;
- 		for_each_online_cpu(i) {
+ 		for_each_cpu(i, c->llc_shared_map) {
 -			if (!per_cpu(cpuid4_info, i))
 +			if (!per_cpu(ici_cpuid4_info, i))
  				continue;
- 			d = &cpu_data(i);
  			this_leaf = CPUID4_INFO_IDX(i, index);
- 			cpumask_copy(to_cpumask(this_leaf->shared_cpu_map),
- 				     d->llc_shared_map);
+ 			for_each_cpu(sibling, c->llc_shared_map) {
+ 				if (!cpu_online(sibling))
+ 					continue;
+ 				set_bit(sibling, this_leaf->shared_cpu_map);
+ 			}
  		}
  		return;
  	}