diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-11 14:56:38 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-11 14:56:38 (GMT) |
| commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
| tree | 7daa04400d833bd722258a49d56a39acfb392520 /arch/arm/kernel | |
| parent | ea7c28518943b26a85d73cd76acd03b71962cb18 (diff) | |
| parent | e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff) | |
| download | linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 9b8c5a1..fb1a69e 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -236,7 +236,7 @@ ENTRY(__setup_mpu) mov r0, #CONFIG_VECTORS_BASE @ Cover from VECTORS_BASE ldr r5,=(MPU_AP_PL1RW_PL0NA | MPU_RGN_NORMAL) /* Writing N to bits 5:1 (RSR_SZ) --> region size 2^N+1 */ - mov r6, #(((PAGE_SHIFT - 1) << MPU_RSR_SZ) | 1 << MPU_RSR_EN) + mov r6, #(((2 * PAGE_SHIFT - 1) << MPU_RSR_SZ) | 1 << MPU_RSR_EN) setup_region r0, r5, r6, MPU_DATA_SIDE @ VECTORS_BASE, PL0 NA, enabled beq 3f @ Memory-map not unified |