Skip to contentSkip to conversation

x86/cpu change for v3.5

GIT PULL Ingo Molnar 1 participant 1 message May 23, 2012 x86

lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

Linus,

Please pull the latest x86-cpu-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

HEAD: ddc5681ed33a279fdc188e98e71f0c539f08c6e6 x86/cache_info: Fix setup of l2/l3 ids

Thanks,

Ingo

------------------>
Shai Fultheim (1):
x86/cache_info: Fix setup of l2/l3 ids

 arch/x86/kernel/cpu/intel_cacheinfo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +2 -2
index b8f3653..9a7c90d 100644
@@ -615,14 +615,14 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
 					new_l2 = this_leaf.size/1024;
 					num_threads_sharing = 1 + this_leaf.eax.split.num_threads_sharing;
 					index_msb = get_count_order(num_threads_sharing);
-					l2_id = c->apicid >> index_msb;
+					l2_id = c->apicid & ~((1 << index_msb) - 1);
 					break;
 				case 3:
 					new_l3 = this_leaf.size/1024;
 					num_threads_sharing = 1 + this_leaf.eax.split.num_threads_sharing;
 					index_msb = get_count_order(
 							num_threads_sharing);
-					l3_id = c->apicid >> index_msb;
+					l3_id = c->apicid & ~((1 << index_msb) - 1);
 					break;
 				default:
 					break;