[PATCH] fix subarch breakage in intel_cacheinfo.c

[PATCH] fix subarch breakage in intel_cacheinfo.c

[James Bottomley]

Not all x86 subarchitectures have support for hyperthreading, so every
piece you add for it has to be predicated on checks for CONFIG_X86_HT.

The patch corrects this hyperthreading leakage problem in
intel_cacheinfo.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

===== arch/i386/kernel/cpu/intel_cacheinfo.c 1.3 vs edited =====
--- 1.3/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-03-31 05:06:44 -06:00
+++ edited/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-04-02 12:03:39 -06:00
@@ -311,8 +311,10 @@
 
 	if (num_threads_sharing == 1)
 		cpu_set(cpu, this_leaf->shared_cpu_map);
+#ifdef CONFIG_X86_HT
 	else if (num_threads_sharing == smp_num_siblings)
 		this_leaf->shared_cpu_map = cpu_sibling_map[cpu];
+#endif
 	else
 		printk(KERN_INFO "Number of CPUs sharing cache didn't match "
 				"any known set of CPUs\n");

RE: [PATCH] fix subarch breakage in intel_cacheinfo.c

[Pallipadi, Venkatesh]

Errr. That was my oversight. I will compile-test the patches 
against all sub-archs in future. Thanks for catching this 
and sending the patch.  

Thanks,
Venki

>-----Original Message-----
>From: James Bottomley [mailto:James.Bottomley@SteelEye.com] 
>Sent: Saturday, April 02, 2005 10:10 AM
>To: Andrew Morton
>Cc: Pallipadi, Venkatesh; Linux Kernel
>Subject: [PATCH] fix subarch breakage in intel_cacheinfo.c
>
>Not all x86 subarchitectures have support for hyperthreading, so every
>piece you add for it has to be predicated on checks for CONFIG_X86_HT.
>
>The patch corrects this hyperthreading leakage problem in
>intel_cacheinfo.c
>
>Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
>
>===== arch/i386/kernel/cpu/intel_cacheinfo.c 1.3 vs edited =====
>--- 1.3/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-03-31 
>05:06:44 -06:00
>+++ edited/arch/i386/kernel/cpu/intel_cacheinfo.c	
>2005-04-02 12:03:39 -06:00
>@@ -311,8 +311,10 @@
> 
> 	if (num_threads_sharing == 1)
> 		cpu_set(cpu, this_leaf->shared_cpu_map);
>+#ifdef CONFIG_X86_HT
> 	else if (num_threads_sharing == smp_num_siblings)
> 		this_leaf->shared_cpu_map = cpu_sibling_map[cpu];
>+#endif
> 	else
> 		printk(KERN_INFO "Number of CPUs sharing cache 
>didn't match "
> 				"any known set of CPUs\n");
>
>
>