Merge branch 'linus' into x86/urgent

Merge reason: We need the x86/uv updates from upstream, to queue up
              dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h
index a3f239545897..8489a0905a87 100644
--- a/arch/sh/include/asm/topology.h
+++ b/arch/sh/include/asm/topology.h
@@ -37,8 +37,11 @@
 #define pcibus_to_node(bus)     ((void)(bus), -1)
 #define pcibus_to_cpumask(bus)  (pcibus_to_node(bus) == -1 ? \
                                         CPU_MASK_ALL : \
-                                        node_to_cpumask(pcibus_to_node(bus)) \
-                                )
+                                        node_to_cpumask(pcibus_to_node(bus)))
+#define cpumask_of_pcibus(bus)  (pcibus_to_node(bus) == -1 ? \
+                                        CPU_MASK_ALL_PTR : \
+                                        cpumask_of_node(pcibus_to_node(bus)))
+
 #endif
 
 #include <asm-generic/topology.h>