diff options
| author | Li Liu <john.liuli@huawei.com> | 2014-07-01 18:01:50 +0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-30 11:15:07 +0200 |
| commit | 6ea8cfca070cd1880ddc53aa839c37c2b0a141f3 (patch) | |
| tree | ab949274440b34801521f147e45bf4f3bf78203d /arch/arm | |
| parent | 6a6ab17612d5dd201198e88d6f7fcb476a7ae127 (diff) | |
| download | lwn-6ea8cfca070cd1880ddc53aa839c37c2b0a141f3.tar.gz lwn-6ea8cfca070cd1880ddc53aa839c37c2b0a141f3.zip | |
ARM: virt: fix wrong HSCTLR.EE bit setting
commit af92394efc8be73edd2301fc15f9b57fd430cd18 upstream.
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>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 797b1a6a4906..6c3b5972d5c9 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -135,7 +135,7 @@ ENTRY(__hyp_stub_install_secondary) THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE #ifdef CONFIG_CPU_BIG_ENDIAN - orr r7, #(1 << 9) @ HSCTLR.EE + orr r7, r7, #(1 << 25) @ HSCTLR.EE #endif mcr p15, 4, r7, c1, c0, 0 @ HSCTLR |