Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbbD3MVM (ORCPT ); Thu, 30 Apr 2015 08:21:12 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53649 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751408AbbD3MMe (ORCPT ); Thu, 30 Apr 2015 08:12:34 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Li Liu , Marc Zyngier , Shannon Zhao , Jiri Slaby Subject: [PATCH 3.12 38/63] ARM: virt: fix wrong HSCTLR.EE bit setting Date: Thu, 30 Apr 2015 14:12:07 +0200 Message-Id: <6ea8cfca070cd1880ddc53aa839c37c2b0a141f3.1430387326.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> References: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1280 Lines: 41 From: Li Liu 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit af92394efc8be73edd2301fc15f9b57fd430cd18 upstream. HSCTLR.EE is defined as bit[25] referring to arm manual DDI0606C.b(p1590). Reviewed-by: Marc Zyngier Signed-off-by: Li Liu Signed-off-by: Marc Zyngier Signed-off-by: Shannon Zhao Signed-off-by: Jiri Slaby --- arch/arm/kernel/hyp-stub.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/