[S390] mm: add ZONE_DMA to 31-bit config again

Add ZONE_DMA to 31-bit config again. The performance gain is minimal
and hardly anybody cares anymore about a 31-bit kernel.
So add ZONE_DMA again to help with SLAB_CACHE_DMA removal for
!CONFIG_ZONE_DMA configurations.

Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ff2d2371b2e92a7dcf931bc0bfcd43a76589dedb..9fab2aa9c2c80d0bbf1fbf0f943b377de3583118 100644 (file)
--- a/arch/s390/Kconfig
+++ b/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/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index e43fe753703114890aaff48dec708aec64f32999..f7d3dc555bdbd5c44b45f7f2feeb75560d38887d 100644 (file)
--- a/arch/s390/appldata/appldata_mem.c
+++ b/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/arch/s390/mm/init.c b/arch/s390/mm/init.c
index dfefc2171691aa6cdc27c95878a1cd12a0d39053..59b663109d9024af9728547208b74a56d5d2d6a2 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/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();