Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6207e816 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Don't special case pci_domain_nr() for iSeries 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9ccc4fd2

arch/powerpc/kernel/pci-common.c

+2 −7
Original line number Diff line number Diff line
@@ -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);



	return hose->global_number;

}

}



EXPORT_SYMBOL(pci_domain_nr);



#ifdef CONFIG_PPC_OF

arch/powerpc/platforms/iseries/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -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;