Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=118bcd31b309d12638f67729d5d96d4974750249
Commit: 118bcd31b309d12638f67729d5d96d4974750249
Parent: 63db6e8d41c703c26a3ce767740a9c8484765a74
Author: Heiko Carstens <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 21 10:55:12 2007 +0100
Committer: Martin Schwidefsky <[EMAIL PROTECTED]>
CommitDate: Wed Feb 21 10:55:12 2007 +0100
[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 <[EMAIL PROTECTED]>
Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]>
---
arch/s390/Kconfig | 4 ++--
arch/s390/mm/init.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eaaac37..d9425f5 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 b3e7c45..916b72a 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);
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
