diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 13:48:00 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 13:48:00 +0300 |
| commit | a1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch) | |
| tree | 3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /arch/arm64/mm/init.c | |
| parent | b2f9d678e28ca71ce650eac82f26dd287b47e89a (diff) | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
| download | linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.xz | |
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/mm/init.c')
| -rw-r--r-- | arch/arm64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f3b061e67bfe..7802f216a67a 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -319,8 +319,8 @@ void __init mem_init(void) #endif MLG(VMALLOC_START, VMALLOC_END), #ifdef CONFIG_SPARSEMEM_VMEMMAP - MLG((unsigned long)vmemmap, - (unsigned long)vmemmap + VMEMMAP_SIZE), + MLG(VMEMMAP_START, + VMEMMAP_START + VMEMMAP_SIZE), MLM((unsigned long)virt_to_page(PAGE_OFFSET), (unsigned long)virt_to_page(high_memory)), #endif |