diff options
| author | James Bottomley <James.Bottomley@SteelEye.com> | 2006-02-14 16:53:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 19:09:34 -0500 |
| commit | 8b09fb34513225d87d511c7e8f29c0fd3cf860e0 (patch) | |
| tree | 3742919b1f14cd0edd2c6584703ebcc8b9ff134e /include | |
| parent | 5ac5f9d1ce8492163dbde5d357dc5d03becf7e36 (diff) | |
[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: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/topology.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index af503a122b23..aa958c6ee83e 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef _ASM_I386_TOPOLOGY_H | 27 | #ifndef _ASM_I386_TOPOLOGY_H |
| 28 | #define _ASM_I386_TOPOLOGY_H | 28 | #define _ASM_I386_TOPOLOGY_H |
| 29 | 29 | ||
| 30 | #ifdef CONFIG_SMP | 30 | #ifdef CONFIG_X86_HT |
| 31 | #define topology_physical_package_id(cpu) \ | 31 | #define topology_physical_package_id(cpu) \ |
| 32 | (phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]) | 32 | (phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]) |
| 33 | #define topology_core_id(cpu) \ | 33 | #define topology_core_id(cpu) \ |