From: James Bottomley <James.Bottomley@SteelEye.com>
Date: Tue, 14 Feb 2006 21:53:05 +0000 (-0800)
Subject: [PATCH] fix x86 topology export in sysfs for subarchitectures
X-Git-Tag: v2.6.16-rc4~71
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8b09fb34513225d87d511c7e8f29c0fd3cf860e0;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h
index af503a122b2..aa958c6ee83 100644
--- a/include/asm-i386/topology.h
+++ b/include/asm-i386/topology.h
@@ -27,7 +27,7 @@
 #ifndef _ASM_I386_TOPOLOGY_H
 #define _ASM_I386_TOPOLOGY_H
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_HT
 #define topology_physical_package_id(cpu)				\
 	(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu])
 #define topology_core_id(cpu)						\