Skip to content

Commit d8b1e10

Browse files
committed
sparc64: fix pci_iounmap() when CONFIG_PCI is not set
Guenter reported [1] that the pci_iounmap() changes remain problematic, with sparc64 allnoconfig and tinyconfig still not building due to the header file changes and confusion with the arch-specific pci_iounmap() implementation. I'm pretty convinced that sparc should just use GENERIC_IOMAP instead of doing its own thing, since it turns out that the sparc64 version of pci_iounmap() is somewhat buggy (see [2]). But in the meantime, this just fixes the build by avoiding the trivial re-definition of the empty case. Link: https://lore.kernel.org/lkml/[email protected]/ [1] Link: https://lore.kernel.org/lkml/CAHk-=wgheheFx9myQyy5osh79BAazvmvYURAtub2gQtMvLrhqQ@mail.gmail.com/ [2] Reported-by: Guenter Roeck <[email protected]> Cc: David Miller <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e4e737b commit d8b1e10

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/sparc/lib/iomap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ void ioport_unmap(void __iomem *addr)
1919
EXPORT_SYMBOL(ioport_map);
2020
EXPORT_SYMBOL(ioport_unmap);
2121

22+
#ifdef CONFIG_PCI
2223
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
2324
{
2425
/* nothing to do */
2526
}
2627
EXPORT_SYMBOL(pci_iounmap);
28+
#endif

0 commit comments

Comments
 (0)