aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-01-09 04:18:47 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-01-09 04:18:47 -0500
commitde338a3795bbcb3c3d77591f65118cbec776cc39 (patch)
treed05a24fdc7e6d1de55b0c0399cdbaa81534b5ae6 /arch
parent6721f77810dfcb7cbf8e97be6fa43fe2740dd0aa (diff)
[S390] Fix vmalloc area size calculation.
setup_memory_end() uses VMALLOC_END instead of VMALLOC_END_INIT to calculate the maximum supported size of physical memory. Since VMALLOC_END is zero, this will cause a crash on 31 bit systems. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 49ef206ec880..5d8ee3baac14 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -476,7 +476,7 @@ static void __init setup_memory_end(void)
476 int i; 476 int i;
477 477
478 memory_size = real_size = 0; 478 memory_size = real_size = 0;
479 max_phys = VMALLOC_END - VMALLOC_MIN_SIZE; 479 max_phys = VMALLOC_END_INIT - VMALLOC_MIN_SIZE;
480 memory_end &= PAGE_MASK; 480 memory_end &= PAGE_MASK;
481 481
482 max_mem = memory_end ? min(max_phys, memory_end) : max_phys; 482 max_mem = memory_end ? min(max_phys, memory_end) : max_phys;