diff options
| -rw-r--r-- | arch/arm/mm/proc-v7-3level.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index e4c8acfc1323..1a24e9232ec8 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S | |||
| @@ -146,12 +146,11 @@ ENDPROC(cpu_v7_set_pte_ext) | |||
| 146 | mov \tmp, \ttbr1, lsr #(32 - ARCH_PGD_SHIFT) @ upper bits | 146 | mov \tmp, \ttbr1, lsr #(32 - ARCH_PGD_SHIFT) @ upper bits |
| 147 | mov \ttbr1, \ttbr1, lsl #ARCH_PGD_SHIFT @ lower bits | 147 | mov \ttbr1, \ttbr1, lsl #ARCH_PGD_SHIFT @ lower bits |
| 148 | addls \ttbr1, \ttbr1, #TTBR1_OFFSET | 148 | addls \ttbr1, \ttbr1, #TTBR1_OFFSET |
| 149 | mcrr p15, 1, \ttbr1, \zero, c2 @ load TTBR1 | 149 | adcls \tmp, \tmp, #0 |
| 150 | mcrr p15, 1, \ttbr1, \tmp, c2 @ load TTBR1 | ||
| 150 | mov \tmp, \ttbr0, lsr #(32 - ARCH_PGD_SHIFT) @ upper bits | 151 | mov \tmp, \ttbr0, lsr #(32 - ARCH_PGD_SHIFT) @ upper bits |
| 151 | mov \ttbr0, \ttbr0, lsl #ARCH_PGD_SHIFT @ lower bits | 152 | mov \ttbr0, \ttbr0, lsl #ARCH_PGD_SHIFT @ lower bits |
| 152 | mcrr p15, 0, \ttbr0, \zero, c2 @ load TTBR0 | 153 | mcrr p15, 0, \ttbr0, \tmp, c2 @ load TTBR0 |
| 153 | mcrr p15, 1, \ttbr1, \zero, c2 @ load TTBR1 | ||
| 154 | mcrr p15, 0, \ttbr0, \zero, c2 @ load TTBR0 | ||
| 155 | .endm | 154 | .endm |
| 156 | 155 | ||
| 157 | /* | 156 | /* |