[patch -mm] optional ZONE_DMA for s390

[Heiko Carstens <heiko.carstens@de.ibm.com>]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

For non-64BIT systems all memory is DMA capable.

Cc: Christoph Lameter <clameter@sgi.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
 arch/s390/Kconfig   |    4 ++--
 arch/s390/mm/init.c |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6.19-rc2-mm2/arch/s390/Kconfig
===================================================================
--- linux-2.6.19-rc2-mm2.orig/arch/s390/Kconfig	2006-10-24 14:19:18.000000000 +0200
+++ linux-2.6.19-rc2-mm2/arch/s390/Kconfig	2006-10-24 14:19:40.000000000 +0200
@@ -8,8 +8,8 @@
 	default y
 
 config ZONE_DMA
-	bool
-	default y
+	def_bool y
+	depends on 64BIT
 
 config LOCKDEP_SUPPORT
 	bool
Index: linux-2.6.19-rc2-mm2/arch/s390/mm/init.c
===================================================================
--- linux-2.6.19-rc2-mm2.orig/arch/s390/mm/init.c	2006-10-24 14:19:32.000000000 +0200
+++ linux-2.6.19-rc2-mm2/arch/s390/mm/init.c	2006-10-24 14:19:52.000000000 +0200
@@ -106,7 +106,6 @@
 	ro_end_pfn = PFN_UP((unsigned long)&__end_rodata);
 
 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-	max_zone_pfns[ZONE_DMA] = max_low_pfn;
 	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 	free_area_init_nodes(max_zone_pfns);
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/