3.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Li Liu <john.li...@huawei.com>

commit af92394efc8be73edd2301fc15f9b57fd430cd18 upstream.

HSCTLR.EE is defined as bit[25] referring to arm manual
DDI0606C.b(p1590).

Reviewed-by: Marc Zyngier <marc.zyng...@arm.com>
Signed-off-by: Li Liu <john.li...@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyng...@arm.com>
Signed-off-by: Shannon Zhao <shannon.z...@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/arm/kernel/hyp-stub.S |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary)
        mcr     p15, 4, r7, c1, c1, 3   @ HSTR
 
 THUMB( orr     r7, #(1 << 30)  )       @ HSCTLR.TE
-#ifdef CONFIG_CPU_BIG_ENDIAN
-       orr     r7, #(1 << 9)           @ HSCTLR.EE
-#endif
+ARM_BE8(orr    r7, r7, #(1 << 25))     @ HSCTLR.EE
        mcr     p15, 4, r7, c1, c0, 0   @ HSCTLR
 
        mrc     p15, 4, r7, c1, c1, 1   @ HDCR


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to