Commit 8b09fb34 authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

[PATCH] fix x86 topology export in sysfs for subarchitectures

The correct way to export hyperthreading based functions is to predicate
them on CONFIG_X86_HT.  Without this, the topology exporting patch breaks
the build on all non-PC x86 subarchitectures.
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ac5f9d1
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef _ASM_I386_TOPOLOGY_H #ifndef _ASM_I386_TOPOLOGY_H
#define _ASM_I386_TOPOLOGY_H #define _ASM_I386_TOPOLOGY_H
#ifdef CONFIG_SMP #ifdef CONFIG_X86_HT
#define topology_physical_package_id(cpu) \ #define topology_physical_package_id(cpu) \
(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]) (phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu])
#define topology_core_id(cpu) \ #define topology_core_id(cpu) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment