diff options
| author | Li Liu <john.liuli@huawei.com> | 2014-07-01 06:01:50 -0400 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-07-11 07:57:38 -0400 |
| commit | af92394efc8be73edd2301fc15f9b57fd430cd18 (patch) | |
| tree | ecfd30b4ac8e96ceed0e7efc5edc9cae6aadf11c /arch/arm/kernel/hyp-stub.S | |
| parent | 67b2abfedb7b861bead93400fa315c5c30879d51 (diff) | |
ARM: virt: fix wrong HSCTLR.EE bit setting
HSCTLR.EE is defined as bit[25] referring to arm manual
DDI0606C.b(p1590).
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Li Liu <john.liuli@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kernel/hyp-stub.S')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 797b1a6a4906..7e666cfda634 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S | |||
| @@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary) | |||
| 134 | mcr p15, 4, r7, c1, c1, 3 @ HSTR | 134 | mcr p15, 4, r7, c1, c1, 3 @ HSTR |
| 135 | 135 | ||
| 136 | THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE | 136 | THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE |
| 137 | #ifdef CONFIG_CPU_BIG_ENDIAN | 137 | ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE |
| 138 | orr r7, #(1 << 9) @ HSCTLR.EE | ||
| 139 | #endif | ||
| 140 | mcr p15, 4, r7, c1, c0, 0 @ HSCTLR | 138 | mcr p15, 4, r7, c1, c0, 0 @ HSCTLR |
| 141 | 139 | ||
| 142 | mrc p15, 4, r7, c1, c1, 1 @ HDCR | 140 | mrc p15, 4, r7, c1, c1, 1 @ HDCR |