From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Jul 2008 14:26:31 +0000 (+0200)
Subject: Merge branch 'linus' into x86/cpu
X-Git-Tag: v2.6.28-rc1~699^2^8~5^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b7d0b6784565b846f3562608dfb3cf8516718724;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/cpu

Conflicts:

	arch/x86/kernel/cpu/intel_cacheinfo.c

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

b7d0b6784565b846f3562608dfb3cf8516718724
diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
index 535d662716d,650d40f7912..d763d24187c
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@@ -511,8 -489,8 +511,8 @@@ static void __cpuinit cache_remove_shar
  	int sibling;
  
  	this_leaf = CPUID4_INFO_IDX(cpu, index);
- 	for_each_cpu_mask(sibling, this_leaf->shared_cpu_map) {
+ 	for_each_cpu_mask_nr(sibling, this_leaf->shared_cpu_map) {
 -		sibling_leaf = CPUID4_INFO_IDX(sibling, index);	
 +		sibling_leaf = CPUID4_INFO_IDX(sibling, index);
  		cpu_clear(cpu, sibling_leaf->shared_cpu_map);
  	}
  }