Message ID | 1554195218-24916-1-git-send-email-vladimir.murzin@arm.com (mailing list archive) |
---|---|
State | Mainlined, archived |
Commit | c3143967807adb1357c36b68a7563fc0c4e1f615 |
Headers | show |
Series | ARM: NOMMU: Fix CCR register faulty initialization when MPU is disabled | expand |
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index c08d2d8..b38bbd0 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -133,9 +133,9 @@ __secondary_data: */ .text __after_proc_init: -#ifdef CONFIG_ARM_MPU M_CLASS(movw r12, #:lower16:BASEADDR_V7M_SCB) M_CLASS(movt r12, #:upper16:BASEADDR_V7M_SCB) +#ifdef CONFIG_ARM_MPU M_CLASS(ldr r3, [r12, 0x50]) AR_CLASS(mrc p15, 0, r3, c0, c1, 4) @ Read ID_MMFR0 and r3, r3, #(MMFR0_PMSA) @ PMSA field