lib: move GENERIC_IOMAP to lib/Kconfig

define GENERIC_IOMAP in a central location
instead of all architectures. This will be helpful
for the follow-up patch which makes it select
other configs. Code is also a bit shorter this way.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 3d74801a40157b09e76263ea5af4546e67fedd30..3636b11ddff0884f8da569e013c061778fc076de 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -70,10 +70,6 @@ config GENERIC_ISA_DMA
        bool
        default y
 
-config GENERIC_IOMAP
-       bool
-       default n
-
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 408b055c585f489e9f3a76c66f32da6680be8d91..b3abfb08aa5c3d32face736f2403fc753a0596c1 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE
 config ARCH_USES_GETTIMEOFFSET
        def_bool n
 
-config GENERIC_IOMAP
-       bool
-       default y
-
 config ARCH_HAS_ILOG2_U32
        bool
        default n
@@ -52,6 +48,7 @@ config CRIS
        select HAVE_IDE
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
+       select GENERIC_IOMAP
 
 config HZ
        int

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 02513c2dd5ec99a9e6d0b4c0e4613465c8110a32..9059e3905887196a48750cf3e531abf0aa6d96df 100644 (file)
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -26,6 +26,7 @@ config HEXAGON
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select NO_IOPORT
+       select GENERIC_IOMAP
        # mostly generic routines, with some accelerated ones
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
@@ -73,9 +74,6 @@ config GENERIC_CSUM
 config GENERIC_IRQ_PROBE
        def_bool y
 
-config GENERIC_IOMAP
-       def_bool y
-
 #config ZONE_DMA
 #      bool
 #      default y

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 27489b6dd5334a2297b24c69536293935728afa3..2732e1b0aa3d2ab0110e6874d219dc5c8875204c 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -29,6 +29,7 @@ config IA64
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_IOMAP
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -102,10 +103,6 @@ config EFI
        bool
        default y
 
-config GENERIC_IOMAP
-       bool
-       default y
-
 config ARCH_CLOCKSOURCE_DATA
        def_bool y
 

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 361d54019bb0bcafaed6e7e6d408d638ae4cd5c5..973e68614f28eb5a0c79627be9c370d73080f6da 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -38,9 +38,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_IOMAP
-       def_bool MMU
-
 config TIME_LOW_RES
        bool
        default y
@@ -73,6 +70,7 @@ source "kernel/Kconfig.freezer"
 config MMU
        bool "MMU-based Paged Memory Management Support"
        default y
+       select GENERIC_IOMAP
        help
          Select if you want MMU-based virtualised addressing space
          support by paged memory management. If unsure, say 'Y'.

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e518a5a4cf4c19abf6f3fa537c478957602a86ad..081a54f1a93d23443f46c576f1031780f090a589 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -38,9 +38,6 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_HWEIGHT
        def_bool y
 
-config GENERIC_IOMAP
-       def_bool y
-
 config NO_IOPORT
        def_bool y
 

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 3fe6d927ad70e928d302192d275fd0b69220af05..100feed979407d5017a6d685fe2af5fef08de066 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -175,9 +175,6 @@ config PPC_INDIRECT_MMIO
 config PPC_IO_WORKAROUNDS
        bool
 
-config GENERIC_IOMAP
-       bool
-
 source "drivers/cpufreq/Kconfig"
 
 menu "CPU Frequency drivers"

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index df169e84db4ed689361431c2044512af1289557b..455ce2d76823eb6c582c30bb3491b3886bbc8276 100644 (file)
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -4,6 +4,7 @@ config SCORE
        def_bool y
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
+       select GENERIC_IOMAP
 
 choice
        prompt "System type"
@@ -33,9 +34,6 @@ endmenu
 config CPU_SCORE7
        bool
 
-config GENERIC_IOMAP
-       def_bool y
-
 config NO_DMA
        bool
        default y

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5629e2099130aeee5c24d7c08f9705d48550e995..5aeab58ac8bebbc5118f7c65c16ffc2a8bdb5498 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -84,9 +84,6 @@ config GENERIC_GPIO
 config GENERIC_CALIBRATE_DELAY
        bool
 
-config GENERIC_IOMAP
-       bool
-
 config GENERIC_CLOCKEVENTS
        def_bool y
 

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 942ed6174f1d073e565d52e5dc074c7e84d3b533..eeb8054c7cd84347d242bba052c44cd64a5da5af 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -12,6 +12,7 @@ config UNICORE32
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_FRAME_POINTERS
+       select GENERIC_IOMAP
        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip
@@ -30,9 +31,6 @@ config GENERIC_CLOCKEVENTS
 config GENERIC_CSUM
        def_bool y
 
-config GENERIC_IOMAP
-       def_bool y
-
 config NO_IOPORT
        bool
 

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cb9a1044a771be75563305f8909097a67cd21778..08af6457de7245c27af8701d6549ccb615f80119 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -75,6 +75,7 @@ config X86
        select HAVE_BPF_JIT if (X86_64 && NET)
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_IOMAP
 
 config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)
@@ -140,9 +141,6 @@ config NEED_SG_DMA_LENGTH
 config GENERIC_ISA_DMA
        def_bool ISA_DMA_API
 
-config GENERIC_IOMAP
-       def_bool y
-
 config GENERIC_BUG
        def_bool y
        depends on BUG

diff --git a/lib/Kconfig b/lib/Kconfig
index 32f3e5ae2be543c59ae3e50682ca504010eb87a3..005892723a523bee81d47bef28af07db42883cfa 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,9 @@ config RATIONAL
 config GENERIC_FIND_FIRST_BIT
        bool
 
+config GENERIC_IOMAP
+       bool
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help