Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/frv/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
index 81fdaa7,973e686..99c3636
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -37,12 -38,6 +37,9 @@@ config GENERIC_CALIBRATE_DELA
        bool
        default y
  
- config GENERIC_IOMAP
-       def_bool MMU
- 
 +config GENERIC_CSUM
 +      bool
 +
  config TIME_LOW_RES
        bool
        default y

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/score/Kconfig
index 8b0c946,455ce2d..3df65d3
--- 1/arch/score/Kconfig
--- 2/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@@ -4,9 -4,7 +4,10 @@@ config SCOR
         def_bool y
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
+        select GENERIC_IOMAP
 +       select HAVE_MEMBLOCK
 +       select HAVE_MEMBLOCK_NODE_MAP
 +       select ARCH_DISCARD_MEMBLOCK
  
  choice
        prompt "System type"

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/tile/kernel/pci.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/asm-generic/io.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge