The patch titled
optional ZONE_DMA for s390
has been added to the -mm tree. Its filename is
optional-zone_dma-for-s390.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: optional ZONE_DMA for s390
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
For non-64BIT systems all memory is DMA capable.
Acked-by: Christoph Lameter <clameter@xxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/Kconfig | 4 ++--
arch/s390/mm/init.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/s390/Kconfig~optional-zone_dma-for-s390 arch/s390/Kconfig
--- a/arch/s390/Kconfig~optional-zone_dma-for-s390
+++ a/arch/s390/Kconfig
@@ -8,8 +8,8 @@ config MMU
default y
config ZONE_DMA
- bool
- default y
+ def_bool y
+ depends on 64BIT
config LOCKDEP_SUPPORT
bool
diff -puN arch/s390/mm/init.c~optional-zone_dma-for-s390 arch/s390/mm/init.c
--- a/arch/s390/mm/init.c~optional-zone_dma-for-s390
+++ a/arch/s390/mm/init.c
@@ -106,7 +106,6 @@ void __init paging_init(void)
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);
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
cpu-topology-consider-sysfs_create_group-return-value.patch
git-s390.patch
scsi-target-needs-pci.patch
optional-zone_dma-for-s390.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
