| From 823a19cd3b91b0729d7417f1848413846be61712 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@arm.linux.org.uk> |
| Date: Tue, 29 Jul 2014 09:24:47 +0100 |
| Subject: ARM: fix alignment of keystone page table fixup |
| |
| From: Russell King <rmk+kernel@arm.linux.org.uk> |
| |
| commit 823a19cd3b91b0729d7417f1848413846be61712 upstream. |
| |
| If init_mm.brk is not section aligned, the LPAE fixup code will miss |
| updating the final PMD. Fix this by aligning map_end. |
| |
| Fixes: a77e0c7b2774 ("ARM: mm: Recreate kernel mappings in early_paging_init()") |
| Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mm/mmu.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/mm/mmu.c |
| +++ b/arch/arm/mm/mmu.c |
| @@ -1436,8 +1436,8 @@ void __init early_paging_init(const stru |
| return; |
| |
| /* remap kernel code and data */ |
| - map_start = init_mm.start_code; |
| - map_end = init_mm.brk; |
| + map_start = init_mm.start_code & PMD_MASK; |
| + map_end = ALIGN(init_mm.brk, PMD_SIZE); |
| |
| /* get a handle on things... */ |
| pgd0 = pgd_offset_k(0); |
| @@ -1472,7 +1472,7 @@ void __init early_paging_init(const stru |
| } |
| |
| /* remap pmds for kernel mapping */ |
| - phys = __pa(map_start) & PMD_MASK; |
| + phys = __pa(map_start); |
| do { |
| *pmdk++ = __pmd(phys | pmdprot); |
| phys += PMD_SIZE; |
