Skip to content

Commit 846f9e1

Browse files
Christoph HellwigRich Felker
authored andcommitted
dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig
Have a single definition that architetures can select. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent bc0f46b commit 846f9e1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

arch/m68k/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ config M68K
1717
select HAVE_COPY_THREAD_TLS
1818
select GENERIC_IRQ_SHOW
1919
select GENERIC_ATOMIC64
20+
select NO_DMA if !MMU && !COLDFIRE
2021
select HAVE_UID16
2122
select VIRT_TO_BUS
2223
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
@@ -60,9 +61,6 @@ config TIME_LOW_RES
6061
config NO_IOPORT_MAP
6162
def_bool y
6263

63-
config NO_DMA
64-
def_bool (MMU && SUN3) || (!MMU && !COLDFIRE)
65-
6664
config ZONE_DMA
6765
bool
6866
default y

arch/m68k/Kconfig.machine

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ config SUN3
126126
depends on MMU
127127
depends on !MMU_MOTOROLA
128128
select MMU_SUN3 if MMU
129+
select NO_DMA
129130
select M68020
130131
help
131132
This option enables support for the Sun 3 series of workstations

arch/um/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ config UML
1515
select HAVE_DEBUG_KMEMLEAK
1616
select HAVE_DEBUG_BUGVERBOSE
1717
select HAVE_COPY_THREAD_TLS
18+
select NO_DMA
1819
select GENERIC_IRQ_SHOW
1920
select GENERIC_CPU_DEVICES
2021
select GENERIC_CLOCKEVENTS
@@ -168,9 +169,6 @@ config MMAPPER
168169
This driver allows a host file to be used as emulated IO memory inside
169170
UML.
170171

171-
config NO_DMA
172-
def_bool y
173-
174172
config PGTABLE_LEVELS
175173
int
176174
default 3 if 3_LEVEL_PGTABLES

kernel/dma/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3+
config NO_DMA
4+
bool
5+
36
config HAS_DMA
47
bool
58
depends on !NO_DMA

0 commit comments

Comments
 (0)