From 82d138ba45e830fe5970e0595c765ecb469fabb1 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 26 May 2011 09:48:31 +0200
Subject: [PATCH] --- yaml --- r: 252221 b: refs/heads/master c:
 69dbb2f79a5626741a24770719406a4edb2cb84f h: refs/heads/master i:   252219:
 3731a6b68571a9e1e6b088ae56eb774b8dcd1084 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/s390/Kconfig                 | 2 +-
 trunk/arch/s390/appldata/appldata_mem.c | 2 --
 trunk/arch/s390/mm/init.c               | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ccaaa44f06e0..04003e1ae69b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33ce614029576b8585e271fd7d90746a37114a15
+refs/heads/master: 69dbb2f79a5626741a24770719406a4edb2cb84f
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index ff2d2371b2e9..9fab2aa9c2c8 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -2,7 +2,7 @@ config MMU
 	def_bool y
 
 config ZONE_DMA
-	def_bool y if 64BIT
+	def_bool y
 
 config LOCKDEP_SUPPORT
 	def_bool y
diff --git a/trunk/arch/s390/appldata/appldata_mem.c b/trunk/arch/s390/appldata/appldata_mem.c
index e43fe7537031..f7d3dc555bdb 100644
--- a/trunk/arch/s390/appldata/appldata_mem.c
+++ b/trunk/arch/s390/appldata/appldata_mem.c
@@ -92,9 +92,7 @@ static void appldata_get_mem_data(void *data)
 	mem_data->pswpin     = ev[PSWPIN];
 	mem_data->pswpout    = ev[PSWPOUT];
 	mem_data->pgalloc    = ev[PGALLOC_NORMAL];
-#ifdef CONFIG_ZONE_DMA
 	mem_data->pgalloc    += ev[PGALLOC_DMA];
-#endif
 	mem_data->pgfault    = ev[PGFAULT];
 	mem_data->pgmajfault = ev[PGMAJFAULT];
 
diff --git a/trunk/arch/s390/mm/init.c b/trunk/arch/s390/mm/init.c
index dfefc2171691..59b663109d90 100644
--- a/trunk/arch/s390/mm/init.c
+++ b/trunk/arch/s390/mm/init.c
@@ -119,9 +119,7 @@ void __init paging_init(void)
 	sparse_memory_present_with_active_regions(MAX_NUMNODES);
 	sparse_init();
 	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
-#ifdef CONFIG_ZONE_DMA
 	max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
-#endif
 	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 	free_area_init_nodes(max_zone_pfns);
 	fault_init();