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

Commit 96499871 authored by Heiko Carstens's avatar Heiko Carstens Committed by Jesse Barnes
Browse files

PCI: fix pci_ioremap_bar() on s390 



s390 doesn't have ioremap_*, so protect the definition of the new
pci_ioremap_bar function with CONFIG_HAS_IOMEM to avoid build breakage.

Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 270c66be

include/linux/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,7 @@ static inline void pci_mmcfg_early_init(void) { } 
static inline void pci_mmcfg_late_init(void) { }

#endif



#ifdef CONFIG_HAS_IOMEM

static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)

{

	/*
@@ -1131,6 +1132,7 @@ static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) 
	return ioremap_nocache(pci_resource_start(pdev, bar),

				     pci_resource_len(pdev, bar));

}

#endif



#endif /* __KERNEL__ */

#endif /* LINUX_PCI_H */