diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-05-10 06:10:22 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-05-11 04:20:30 -0400 |
commit | c34a69059d7876e0793eb410deedfb08ccb22b02 (patch) | |
tree | 18d24e5fd7a5f8e881467035e3e61368d1834adb /arch/s390/mm | |
parent | ca21872e43e82c2a5c2e056ee4aea40a921720b1 (diff) |
s390/vmem: fix identity mapping
The identity mapping is suboptimal for the last 2GB frame. The mapping
will be established with a mix of 4KB and 1MB mappings instead of a
single 2GB mapping.
This happens because of a off-by-one bug introduced with
commit 50be63450728 ("s390/mm: Convert bootmem to memblock").
Currently the identity mapping looks like this:
0x0000000080000000-0x0000000180000000 4G PUD RW
0x0000000180000000-0x00000001fff00000 2047M PMD RW
0x00000001fff00000-0x0000000200000000 1M PTE RW
With the bug fixed it looks like this:
0x0000000080000000-0x0000000200000000 6G PUD RW
Fixes: 50be63450728 ("s390/mm: Convert bootmem to memblock")
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r-- | arch/s390/mm/vmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index d27fccbad7c1..f7ad6cd38e3e 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
@@ -370,7 +370,7 @@ void __init vmem_map_init(void) | |||
370 | ro_end = (unsigned long)&_eshared & PAGE_MASK; | 370 | ro_end = (unsigned long)&_eshared & PAGE_MASK; |
371 | for_each_memblock(memory, reg) { | 371 | for_each_memblock(memory, reg) { |
372 | start = reg->base; | 372 | start = reg->base; |
373 | end = reg->base + reg->size - 1; | 373 | end = reg->base + reg->size; |
374 | if (start >= ro_end || end <= ro_start) | 374 | if (start >= ro_end || end <= ro_start) |
375 | vmem_add_mem(start, end - start, 0); | 375 | vmem_add_mem(start, end - start, 0); |
376 | else if (start >= ro_start && end <= ro_end) | 376 | else if (start >= ro_start && end <= ro_end) |