2 files changed, 16 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 9979c43cc8c7..68102ce7e438 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -639,3 +639,19 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
                 hose->mem_resources[memno-1] = tmp;
         }
 }
+
+/* Decide whether to display the domain number in /proc */
+int pci_proc_domain(struct pci_bus *bus)
+{
+        struct pci_controller *hose = pci_bus_to_host(bus);
+#ifdef CONFIG_PPC64
+        return hose->buid != 0;
+#else
+        if (!(ppc_pci_flags & PPC_PCI_ENABLE_PROC_DOMAINS))
+                return 0;
+        if (ppc_pci_flags & PPC_PCI_COMPAT_DOMAIN_0)
+                return hose->global_number != 0;
+        return 1;
+#endif
+}
+
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 3e7cf7af3bf3..e0f3731c3a1c 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -586,14 +586,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return 0;
 }
 
-/* Decide whether to display the domain number in /proc */
-int pci_proc_domain(struct pci_bus *bus)
-{
-        struct pci_controller *hose = pci_bus_to_host(bus);
-        return hose->buid != 0;
-}
-
-
 #ifdef CONFIG_HOTPLUG
 
 int pcibios_unmap_io_space(struct pci_bus *bus)