diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-07 02:04:33 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 13:42:36 +1100 |
| commit | 6207e81695c1a64ebed668f26106f3384ad2323a (patch) | |
| tree | ec303ea6f50cf41fb51eb027025239146f9d50db | |
| parent | 9ccc4fd260397f0f8ac6078f4cd45fda2d320ead (diff) | |
| download | blackbird-op-linux-6207e81695c1a64ebed668f26106f3384ad2323a.tar.gz blackbird-op-linux-6207e81695c1a64ebed668f26106f3384ad2323a.zip | |
[POWERPC] Don't special case pci_domain_nr() for iSeries
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 78cdb700451c..5a9d4c7bfec5 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -115,15 +115,10 @@ int pcibios_vaddr_is_ioport(void __iomem *address) */ int pci_domain_nr(struct pci_bus *bus) { - if (firmware_has_feature(FW_FEATURE_ISERIES)) - return 0; - else { - struct pci_controller *hose = pci_bus_to_host(bus); + struct pci_controller *hose = pci_bus_to_host(bus); - return hose->global_number; - } + return hose->global_number; } - EXPORT_SYMBOL(pci_domain_nr); #ifdef CONFIG_PPC_OF diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index db0a17e9c4cc..3071a30356ce 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -673,6 +673,8 @@ void __init iSeries_pcibios_init(void) phb = pcibios_alloc_controller(node); if (phb == NULL) continue; + /* All legacy iSeries PHBs are in domain zero */ + phb->global_number = 0; phb->pci_mem_offset = bus; phb->first_busno = bus; |
