Skip to content

Commit 4673ca8

Browse files
committed
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>
1 parent caca6a0 commit 4673ca8

File tree

12 files changed

+10
-36
lines changed

12 files changed

+10
-36
lines changed

arch/alpha/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ config GENERIC_ISA_DMA
7070
bool
7171
default y
7272

73-
config GENERIC_IOMAP
74-
bool
75-
default n
76-
7773
source "init/Kconfig"
7874
source "kernel/Kconfig.freezer"
7975

arch/cris/Kconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE
1919
config ARCH_USES_GETTIMEOFFSET
2020
def_bool n
2121

22-
config GENERIC_IOMAP
23-
bool
24-
default y
25-
2622
config ARCH_HAS_ILOG2_U32
2723
bool
2824
default n
@@ -52,6 +48,7 @@ config CRIS
5248
select HAVE_IDE
5349
select HAVE_GENERIC_HARDIRQS
5450
select GENERIC_IRQ_SHOW
51+
select GENERIC_IOMAP
5552

5653
config HZ
5754
int

arch/hexagon/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ config HEXAGON
2626
select HAVE_ARCH_KGDB
2727
select HAVE_ARCH_TRACEHOOK
2828
select NO_IOPORT
29+
select GENERIC_IOMAP
2930
# mostly generic routines, with some accelerated ones
3031
---help---
3132
Qualcomm Hexagon is a processor architecture designed for high
@@ -73,9 +74,6 @@ config GENERIC_CSUM
7374
config GENERIC_IRQ_PROBE
7475
def_bool y
7576

76-
config GENERIC_IOMAP
77-
def_bool y
78-
7977
#config ZONE_DMA
8078
# bool
8179
# default y

arch/ia64/Kconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ config IA64
2929
select GENERIC_IRQ_SHOW
3030
select ARCH_WANT_OPTIONAL_GPIOLIB
3131
select ARCH_HAVE_NMI_SAFE_CMPXCHG
32+
select GENERIC_IOMAP
3233
default y
3334
help
3435
The Itanium Processor Family is Intel's 64-bit successor to
@@ -102,10 +103,6 @@ config EFI
102103
bool
103104
default y
104105

105-
config GENERIC_IOMAP
106-
bool
107-
default y
108-
109106
config ARCH_CLOCKSOURCE_DATA
110107
def_bool y
111108

arch/m68k/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ config GENERIC_CALIBRATE_DELAY
3838
bool
3939
default y
4040

41-
config GENERIC_IOMAP
42-
def_bool MMU
43-
4441
config TIME_LOW_RES
4542
bool
4643
default y
@@ -73,6 +70,7 @@ source "kernel/Kconfig.freezer"
7370
config MMU
7471
bool "MMU-based Paged Memory Management Support"
7572
default y
73+
select GENERIC_IOMAP
7674
help
7775
Select if you want MMU-based virtualised addressing space
7876
support by paged memory management. If unsure, say 'Y'.

arch/openrisc/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ config RWSEM_XCHGADD_ALGORITHM
3838
config GENERIC_HWEIGHT
3939
def_bool y
4040

41-
config GENERIC_IOMAP
42-
def_bool y
43-
4441
config NO_IOPORT
4542
def_bool y
4643

arch/powerpc/platforms/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ config PPC_INDIRECT_MMIO
175175
config PPC_IO_WORKAROUNDS
176176
bool
177177

178-
config GENERIC_IOMAP
179-
bool
180-
181178
source "drivers/cpufreq/Kconfig"
182179

183180
menu "CPU Frequency drivers"

arch/score/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ config SCORE
44
def_bool y
55
select HAVE_GENERIC_HARDIRQS
66
select GENERIC_IRQ_SHOW
7+
select GENERIC_IOMAP
78

89
choice
910
prompt "System type"
@@ -33,9 +34,6 @@ endmenu
3334
config CPU_SCORE7
3435
bool
3536

36-
config GENERIC_IOMAP
37-
def_bool y
38-
3937
config NO_DMA
4038
bool
4139
default y

arch/sh/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ config GENERIC_GPIO
8484
config GENERIC_CALIBRATE_DELAY
8585
bool
8686

87-
config GENERIC_IOMAP
88-
bool
89-
9087
config GENERIC_CLOCKEVENTS
9188
def_bool y
9289

arch/unicore32/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ config UNICORE32
1212
select GENERIC_IRQ_PROBE
1313
select GENERIC_IRQ_SHOW
1414
select ARCH_WANT_FRAME_POINTERS
15+
select GENERIC_IOMAP
1516
help
1617
UniCore-32 is 32-bit Instruction Set Architecture,
1718
including a series of low-power-consumption RISC chip
@@ -30,9 +31,6 @@ config GENERIC_CLOCKEVENTS
3031
config GENERIC_CSUM
3132
def_bool y
3233

33-
config GENERIC_IOMAP
34-
def_bool y
35-
3634
config NO_IOPORT
3735
bool
3836

0 commit comments

Comments
 (0)