diff options
| author | James Bottomley <james.bottomley@steeleye.com> | 2005-04-03 17:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-03 17:36:01 -0700 |
| commit | 4b5798fbb5e87b423f28622e1a912105643cd9f6 (patch) | |
| tree | 6783e32d2d5832c7ebe8b28402538014e025ae84 | |
| parent | 6d029ef5cc2a9f0447b5c114fe84a7f21861e4cb (diff) | |
| download | history-4b5798fbb5e87b423f28622e1a912105643cd9f6.tar.gz | |
[PATCH] x86: 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/cpu/intel_cacheinfo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c index 7d1d350bf87e8c..aeb5b4ef8c8b52 100644 --- a/arch/i386/kernel/cpu/intel_cacheinfo.c +++ b/arch/i386/kernel/cpu/intel_cacheinfo.c @@ -311,8 +311,10 @@ static void __devinit cache_shared_cpu_map_setup(unsigned int cpu, int index) 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"); |