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

arch: fix ioport mapping on mips,sh

Kevin Cernekee reported that recent cleanup that replaced pci_iomap with
a generic function failed to take into account the differences in io
port handling on mips and sh architectures.

Rather than revert the changes reintroducing the code duplication, this
patchset fixes this by adding ability for architectures to override
ioport mapping for pci devices.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  sh: use the the PCI channels's io_map_base
  mips: use the the PCI controller's io_map_base
  lib: add NO_GENERIC_PCI_IOPORT_MAP

diff --combined lib/Kconfig
index d69d321a0997d967563e2ab254b52262d2321aa5,1df13883481c57bf7c93ad0d5e3d7871b81dd4c2..028aba9e72af98b402aeec059e0800681e1fad5a
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -19,6 -19,9 +19,9 @@@ config RATIONA
  config GENERIC_FIND_FIRST_BIT
        bool
  
+ config NO_GENERIC_PCI_IOPORT_MAP
+       bool
+ 
  config GENERIC_PCI_IOMAP
        bool
  
@@@ -279,9 -282,6 +282,9 @@@ config AVERAG
  
          If unsure, say N.
  
 +config CLZ_TAB
 +      bool
 +
  config CORDIC
        tristate "CORDIC algorithm"
        help
@@@ -290,7 -290,6 +293,7 @@@
  
  config MPILIB
        tristate
 +      select CLZ_TAB
        help
          Multiprecision maths library from GnuPG.
          It is used to implement RSA digital signature verification,