diff --git a/[refs] b/[refs]
index fcc2208519a8..4b097b954de4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ac5f9d1ce8492163dbde5d357dc5d03becf7e36
+refs/heads/master: 8b09fb34513225d87d511c7e8f29c0fd3cf860e0
diff --git a/trunk/include/asm-i386/topology.h b/trunk/include/asm-i386/topology.h
index af503a122b23..aa958c6ee83e 100644
--- a/trunk/include/asm-i386/topology.h
+++ b/trunk/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)						\