Merge branch 'linus' into x86/cpu
Ingo Molnar [Mon, 28 Jul 2008 14:26:31 +0000 (16:26 +0200)]
Conflicts:

arch/x86/kernel/cpu/intel_cacheinfo.c

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

1  2 
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);
        }
  }