diff --git a/[refs] b/[refs]
index c11ad416c1c6..c906c4b2e442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 507279db1819aacf4022e790b3fc8bc8cf56debf
+refs/heads/master: 318facbee05417fb432603a8309a10cdb942a87b
diff --git a/trunk/include/asm-powerpc/topology.h b/trunk/include/asm-powerpc/topology.h
index 87362a05542b..b7abd423c570 100644
--- a/trunk/include/asm-powerpc/topology.h
+++ b/trunk/include/asm-powerpc/topology.h
@@ -32,8 +32,13 @@ static inline int node_to_first_cpu(int node)
 
 int of_node_to_nid(struct device_node *device);
 
+#ifdef CONFIG_PPC64
+#define pcibus_to_node(bus)	(of_node_to_nid(bus->sysdata))
+#define pcibus_to_cpumask(bus)	(node_to_cpumask(of_node_to_nid(bus->sysdata)))
+#else
 #define pcibus_to_node(node)    (-1)
 #define pcibus_to_cpumask(bus)	(cpu_online_map)
+#endif
 
 /* sched_domains SD_NODE_INIT for PPC64 machines */
 #define SD_NODE_INIT (struct sched_domain) {		\