History

dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig

Have a single definition that architetures can select.

Christoph Hellwig committed 6 years ago

Commit 846f9e11 parent bc0f46b4 files · +6 −6Browse files

Unified · Split

4 files
  1. arch/m68k/Kconfig +1 −3
  2. arch/m68k/Kconfig.machine +1 −0
  3. arch/um/Kconfig +1 −3
  4. kernel/dma/Kconfig +3 −0
arch/m68k/Kconfig+1−3
@@ -17,6 +17,7 @@ config M68K · 16 unmodified lines
17 select HAVE_COPY_THREAD_TLS17 select HAVE_COPY_THREAD_TLS
18 select GENERIC_IRQ_SHOW18 select GENERIC_IRQ_SHOW
19 select GENERIC_ATOMIC6419 select GENERIC_ATOMIC64
20 select NO_DMA if !MMU && !COLDFIRE
20 select HAVE_UID1621 select HAVE_UID16
21 select VIRT_TO_BUS22 select VIRT_TO_BUS
22 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS23 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
@@ -60,9 +61,6 @@ config TIME_LOW_RES · 37 unmodified lines
60config NO_IOPORT_MAP61config NO_IOPORT_MAP
61 def_bool y62 def_bool y
62 63
63config NO_DMA
64 def_bool (MMU && SUN3) || (!MMU && !COLDFIRE)
65
66config ZONE_DMA64config ZONE_DMA
67 bool65 bool
68 default y66 default y
arch/m68k/Kconfig.machine+1−0
@@ -126,6 +126,7 @@ config SUN3 · 125 unmodified lines
126 depends on MMU126 depends on MMU
127 depends on !MMU_MOTOROLA127 depends on !MMU_MOTOROLA
128 select MMU_SUN3 if MMU128 select MMU_SUN3 if MMU
129 select NO_DMA
129 select M68020130 select M68020
130 help131 help
131 This option enables support for the Sun 3 series of workstations132 This option enables support for the Sun 3 series of workstations
arch/um/Kconfig+1−3
@@ -15,6 +15,7 @@ config UML · 14 unmodified lines
15 select HAVE_DEBUG_KMEMLEAK15 select HAVE_DEBUG_KMEMLEAK
16 select HAVE_DEBUG_BUGVERBOSE16 select HAVE_DEBUG_BUGVERBOSE
17 select HAVE_COPY_THREAD_TLS17 select HAVE_COPY_THREAD_TLS
18 select NO_DMA
18 select GENERIC_IRQ_SHOW19 select GENERIC_IRQ_SHOW
19 select GENERIC_CPU_DEVICES20 select GENERIC_CPU_DEVICES
20 select GENERIC_CLOCKEVENTS21 select GENERIC_CLOCKEVENTS
@@ -168,9 +169,6 @@ config MMAPPER · 147 unmodified lines
168 This driver allows a host file to be used as emulated IO memory inside169 This driver allows a host file to be used as emulated IO memory inside
169 UML.170 UML.
170 171
171config NO_DMA
172 def_bool y
173
174config PGTABLE_LEVELS172config PGTABLE_LEVELS
175 int173 int
176 default 3 if 3_LEVEL_PGTABLES174 default 3 if 3_LEVEL_PGTABLES
kernel/dma/Kconfig+3−0
@@ -1,5 +1,8 @@
1# SPDX-License-Identifier: GPL-2.0-only1# SPDX-License-Identifier: GPL-2.0-only
2 2
3config NO_DMA
4 bool
5
3config HAS_DMA6config HAS_DMA
4 bool7 bool
5 depends on !NO_DMA8 depends on !NO_DMA

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t