Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+1 -5
+1 -1
arch/s390/Kconfig
··· 2 2 def_bool y 3 3 4 4 config ZONE_DMA 5 - def_bool y if 64BIT 5 + def_bool y 6 6 7 7 config LOCKDEP_SUPPORT 8 8 def_bool y
-2
arch/s390/appldata/appldata_mem.c
··· 92 92 mem_data->pswpin = ev[PSWPIN]; 93 93 mem_data->pswpout = ev[PSWPOUT]; 94 94 mem_data->pgalloc = ev[PGALLOC_NORMAL]; 95 - #ifdef CONFIG_ZONE_DMA 96 95 mem_data->pgalloc += ev[PGALLOC_DMA]; 97 - #endif 98 96 mem_data->pgfault = ev[PGFAULT]; 99 97 mem_data->pgmajfault = ev[PGMAJFAULT]; 100 98
-2
arch/s390/mm/init.c
··· 119 119 sparse_memory_present_with_active_regions(MAX_NUMNODES); 120 120 sparse_init(); 121 121 memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); 122 - #ifdef CONFIG_ZONE_DMA 123 122 max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS); 124 - #endif 125 123 max_zone_pfns[ZONE_NORMAL] = max_low_pfn; 126 124 free_area_init_nodes(max_zone_pfns); 127 125 fault_init();