X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fasm-ia64%2Ftopology.h;h=f2f72ef2a8974cc3496dc0fd92435626f708a7e8;hb=fba5c1af5c4fd6645fe62ea84ccde0981282cf66;hp=233f1caae048b2b5454c255248bd664d600eefc9;hpb=69f7c0a1be84b10a81b6edcce2dbee0cdec26eba;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index 233f1ca..f2f72ef 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -93,7 +93,7 @@ void build_cpu_to_node_map(void);
 	.cache_nice_tries	= 2,			\
 	.busy_idx		= 3,			\
 	.idle_idx		= 2,			\
-	.newidle_idx		= 0, /* unused */	\
+	.newidle_idx		= 2,			\
 	.wake_idx		= 1,			\
 	.forkexec_idx		= 1,			\
 	.flags			= SD_LOAD_BALANCE	\
@@ -112,10 +112,15 @@ void build_cpu_to_node_map(void);
 #define topology_physical_package_id(cpu)	(cpu_data(cpu)->socket_id)
 #define topology_core_id(cpu)			(cpu_data(cpu)->core_id)
 #define topology_core_siblings(cpu)		(cpu_core_map[cpu])
-#define topology_thread_siblings(cpu)		(cpu_sibling_map[cpu])
+#define topology_thread_siblings(cpu)		(per_cpu(cpu_sibling_map, cpu))
 #define smt_capable() 				(smp_num_siblings > 1)
 #endif
 
+#define pcibus_to_cpumask(bus)	(pcibus_to_node(bus) == -1 ? \
+					CPU_MASK_ALL : \
+					node_to_cpumask(pcibus_to_node(bus)) \
+				)
+
 #include <asm-generic/topology.h>
 
 #endif /* _ASM_IA64_TOPOLOGY_H */