[PATCH] Fix non-LPAE boot regression.

Catalin Marinas catalin.marinas at arm.com
Sat Aug 13 10:14:30 EDT 2011


On Saturday, 13 August 2011, Vasily Khoruzhick <anarsoul at gmail.com> wrote:
> It was introduced by  407f8b4cb07cbc5c1c7cc386f231224e2524ccea
> ARM: LPAE: MMU setup for the 3-level page table format
>
> Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
> ---
>  arch/arm/kernel/head.S |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
> index 0bdafc4..5add5f5 100644
> --- a/arch/arm/kernel/head.S
> +++ b/arch/arm/kernel/head.S
> @@ -206,7 +206,7 @@ __create_page_tables:
>  1:     orr     r3, r7, r5, lsl #SECTION_SHIFT  @ flags + kernel base
>         str     r3, [r4, r5, lsl #PMD_ORDER]    @ identity mapping
>         cmp     r5, r6
> -       addlo   r5, r5, #SECTION_SHIFT >> 20    @ next section
> +       addlo   r5, r5, #1                      @ next section
>         blo     1b

Thanks for this. The original code was indeed broken but I think the
fix should be to use SECTION_SIZE instead of SHIFT. I'll have a look
on Monday.

-- 
Catalin



More information about the linux-arm-kernel mailing list