[PATCH] optional ZONE_DMA: introduce CONFIG_ZONE_DMA

This patch simply defines CONFIG_ZONE_DMA for all arches.  We later do special
things with CONFIG_ZONE_DMA after the VM and an arch are prepared to work
without ZONE_DMA.

CONFIG_ZONE_DMA can be defined in two ways depending on how an architecture
handles ISA DMA.

First if CONFIG_GENERIC_ISA_DMA is set by the arch then we know that the arch
needs ZONE_DMA because ISA DMA devices are supported.  We can catch this in
mm/Kconfig and do not need to modify arch code.

Second, arches may use ZONE_DMA in an unknown way.  We set CONFIG_ZONE_DMA for
all arches that do not set CONFIG_GENERIC_ISA_DMA in order to insure backwards
compatibility.  The arches may later undefine ZONE_DMA if their arch code has
been verified to not depend on ZONE_DMA.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Matthew Wilcox <willy@debian.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 3474309e049c857ac2192c50fe1429358aff0dfc..e3db1427dbe5262654cb2a6f57b7c6f8bb10b4bf 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,6 +9,10 @@ config MMU
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 7561d7b72e75408bb05f3998008c2cee2b1debcf..cea237413aa242b995442e5abee32cfdac728fca 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,6 +6,10 @@ config FRV
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 34a84bc4baf59ae515c1a0b0c899deee21604ef4..146eb28f622583800bffc5a4b18cf42708b27070 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -17,6 +17,10 @@ config SWAP
        bool
        default n
 
+config ZONE_DMA
+       bool
+       default y
+
 config FPU
        bool
        default n

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index f1d2899e9a629763173afffb8d86766a5fac08fc..549ead597934045850674f5d2ab093c7b1fc089b 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -24,6 +24,10 @@ config 64BIT
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config MMU
        bool
        default y

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 25993c2a8fbbeb4c540218980f05d22c60a9dfcb..c5fc5406dad01b26824bfd348420859713ae0a48 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -17,6 +17,10 @@ config FPU
        bool
        default n
 
+config ZONE_DMA
+       bool
+       default y
+
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eaed402ad3460a758872ccf271971a36f6042add..c6497300426123623b3ed86494845fb338333cec 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,6 +7,10 @@ config MMU
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config LOCKDEP_SUPPORT
        bool
        default y

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index f0d4d72e560fe8e1b68700e6c87929da3239bae6..dbfab8fc9b49c2c4c6e620558401f57af2bedf50 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,6 +10,9 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
+config ZONE_DMA
+       bool
+       default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2e74cb0b7807fd986fa4993e9baf4044f8c015f9..7c99d518e49e487ca7195fd51cc1ceff21257f5a 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -7,6 +7,10 @@ config FRAME_POINTER
        bool
        default n
 
+config ZONE_DMA
+       bool
+       default y
+
 config XTENSA
        bool
        default y

diff --git a/mm/Kconfig b/mm/Kconfig
index db7c55de92cdc2ded0583d1ccc5239bdb4828d00..50f7cfc15b78d990cbc15aab883f6a9885343c57 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -139,6 +139,10 @@ config SPLIT_PTLOCK_CPUS
        default "4096" if PARISC && !PA20
        default "4"
 
+config ZONE_DMA
+       def_bool y
+       depends on GENERIC_ISA_DMA
+
 #
 # support for page migration
 #