Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · e343a895
    Linus Torvalds authored
    lib: use generic pci_iomap on all architectures
    
    Many architectures don't want to pull in iomap.c,
    so they ended up duplicating pci_iomap from that file.
    That function isn't trivial, and we are going to modify it
    https://lkml.org/lkml/2011/11/14/183
    so the duplication hurts.
    
    This reduces the scope of the problem significantly,
    by moving pci_iomap to a separate file and
    referencing that from all architectures.
    
    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
      alpha: drop pci_iomap/pci_iounmap from pci-noop.c
      mn10300: switch to GENERIC_PCI_IOMAP
      mn10300: add missing __iomap markers
      frv: switch to GENERIC_PCI_IOMAP
      tile: switch to GENERIC_PCI_IOMAP
      tile: don't panic on iomap
      sparc: switch to GENERIC_PCI_IOMAP
      sh: switch to GENERIC_PCI_IOMAP
      powerpc: switch to GENERIC_PCI_IOMAP
      parisc: switch to GENERIC_PCI_IOMAP
      mips: switch to GENERIC_PCI_IOMAP
      microblaze: switch to GENERIC_PCI_IOMAP
      arm: switch to GENERIC_PCI_IOMAP
      alpha: switch to GENERIC_PCI_IOMAP
      lib: add GENERIC_PCI_IOMAP
      lib: move GENERIC_IOMAP to lib/Kconfig
    
    Fix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig
    e343a895