Index: linux-2.6.17/arch/ia64/Kconfig
===================================================================
--- linux-2.6.17.orig/arch/ia64/Kconfig	2006-07-02 17:45:29.000000000 -0700
+++ linux-2.6.17/arch/ia64/Kconfig	2006-07-02 18:02:36.000000000 -0700
@@ -66,9 +66,12 @@
 	bool
 	select GENERIC_ALLOCATOR
 
-config DMA_IS_DMA32
-	bool
-	default y
+#
+# Most supported machines use ZONE_DMA for 32 bit DMA.
+# However, SGI machines treat all memory equal.
+#
+config ZONE_DMA
+	def_bool y if !SGI_SN2
 
 choice
 	prompt "System type"
Index: linux-2.6.17/arch/x86_64/Kconfig
===================================================================
--- linux-2.6.17.orig/arch/x86_64/Kconfig	2006-07-02 17:45:29.000000000 -0700
+++ linux-2.6.17/arch/x86_64/Kconfig	2006-07-02 18:02:36.000000000 -0700
@@ -65,6 +65,10 @@
 	bool
 	default y
 
+config ZONE_DMA32
+	bool
+	default y
+
 config GENERIC_IOMAP
 	bool
 	default y
Index: linux-2.6.17/mm/Kconfig
===================================================================
--- linux-2.6.17.orig/mm/Kconfig	2006-07-02 17:45:29.000000000 -0700
+++ linux-2.6.17/mm/Kconfig	2006-07-02 18:02:36.000000000 -0700
@@ -133,6 +133,9 @@
 	default "4096" if PARISC && !PA20
 	default "4"
 
+config ZONE_DMA
+	def_bool y if GENERIC_ISA_DMA || ZONE_DMA32
+
 #
 # support for page migration
 #
Index: linux-2.6.17/include/linux/mmzone.h
===================================================================
--- linux-2.6.17.orig/include/linux/mmzone.h	2006-07-02 17:57:27.000000000 -0700
+++ linux-2.6.17/include/linux/mmzone.h	2006-07-02 18:02:36.000000000 -0700
@@ -72,20 +72,6 @@
 #define zone_pcp(__z, __cpu) (&(__z)->pageset[(__cpu)])
 #endif
 
-/*
- * Transitional definitions until all arches have converted
- * to the new scheme to indicate what types of zones are needed.
- */
-
-#ifndef CONFIG_DMA_IS_NORMAL
-#define CONFIG_ZONE_DMA
-#endif
-
-#ifndef CONFIG_DMA_IS_DMA32
-#define CONFIG_ZONE_DMA32
-#endif
-
-
 typedef enum {
 #ifdef CONFIG_ZONE_DMA
 	/*
Index: linux-2.6.17/arch/s390/Kconfig
===================================================================
--- linux-2.6.17.orig/arch/s390/Kconfig	2006-07-02 17:45:29.000000000 -0700
+++ linux-2.6.17/arch/s390/Kconfig	2006-07-02 18:02:36.000000000 -0700
@@ -25,6 +25,10 @@
 config GENERIC_BUST_SPINLOCK
 	bool
 
+config ZONE_DMA
+	bool
+	default y
+
 mainmenu "Linux Kernel Configuration"
 
 config S390