summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-02-21 10:55:12 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-21 10:55:12 +0100
commit118bcd31b309d12638f67729d5d96d4974750249 (patch)
treef6bcceeada38052b47fe6b5b93348bc615468c19 /arch/s390
parent63db6e8d41c703c26a3ce767740a9c8484765a74 (diff)
[S390] Optional ZONE_DMA for s390.
Disable ZONE_DMA on 31-bit. All memory is addressable by all devices and we do not need any special memory pool. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig4
-rw-r--r--arch/s390/mm/init.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eaaac378811..d9425f59be9 100644
--- a/arch/s390/Kconfig
+++ b/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 --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index b3e7c45efb6..916b72a8cde 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -141,7 +141,9 @@ void __init paging_init(void)
__raw_local_irq_ssm(ssm_mask);
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);
}