| Message ID | 1429853281-6136-39-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBCOL5N4BVYCBBFVL46UQKGQEKVAQUTQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2F65120553 for <linaro@patches.linaro.org>; Fri, 24 Apr 2015 05:33:11 +0000 (UTC) Received: by wicmx19 with SMTP id mx19sf1557402wic.3 for <linaro@patches.linaro.org>; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Garsaf9XOAe9kkIMZ3qNzzmibqcmKx87hN1PCs0oGFI=; b=fBeGO4VTRWRhnRVRSLyPzo7QlGHihf7gq6aZUx33GYK+e8WM8mViMYxF+bqujTfkZc NwM4SxnAOecbrE3nzlCnJI4haTj6mtujuDXFkx3YmTL9aPXQtZkJEh5vNFiAkP0Wg73+ I2EntDT4A4kXntfE5Roe0IbBegvVirPBaLvkJnJ9woXIfz6h6QCwE8bJSH/qZgNzCHCR 0pr8PLrFQfrI96iCz56TrfCb6OH+jzYbsnN2VlSIznMNJ3ti8CfniMv7rrver5pWUJb/ gZhigARO2RWgt/OUeFai4rXsfER2KYUGbAizCEVzHu/nyahod1jlb0FRK3w9HdLcmkZK rpRA== X-Gm-Message-State: ALoCoQnrMXXKR7cpGndpvDBdYT6a6CAl/1AkbZOjdL503OQCz5yvGYczX3ubn+JOgwOdrzOlvqSX X-Received: by 10.152.184.73 with SMTP id es9mr3218182lac.4.1429853590435; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.244.162 with SMTP id xh2ls454665lac.108.gmail; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) X-Received: by 10.112.235.133 with SMTP id um5mr5596531lbc.7.1429853590252; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id pr4si7464603lbb.133.2015.04.23.22.33.10 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:33:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcga7 with SMTP id ga7so28630785lbc.1 for <patchwork-forward@linaro.org>; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) X-Received: by 10.152.26.34 with SMTP id i2mr5346875lag.117.1429853590136; Thu, 23 Apr 2015 22:33:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp978309lbt; Thu, 23 Apr 2015 22:33:09 -0700 (PDT) X-Received: by 10.66.137.2 with SMTP id qe2mr11486581pab.77.1429853588365; Thu, 23 Apr 2015 22:33:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.33.07; Thu, 23 Apr 2015 22:33:08 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754549AbbDXFdH (ORCPT <rfc822;shannon.zhao@linaro.org> + 2 others); Fri, 24 Apr 2015 01:33:07 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:32817 "EHLO mail-oi0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754545AbbDXFdG (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 24 Apr 2015 01:33:06 -0400 Received: by oica37 with SMTP id a37so32472392oic.0 for <stable@vger.kernel.org>; Thu, 23 Apr 2015 22:33:06 -0700 (PDT) X-Received: by 10.182.27.34 with SMTP id q2mr5777765obg.72.1429853586011; Thu, 23 Apr 2015 22:33:06 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id mk8sm6092130obc.3.2015.04.23.22.33.03 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:33:05 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Li Liu <john.liuli@huawei.com>, Marc Zyngier <marc.zyngier@arm.com> Subject: [PATCH for 3.12.y stable 38/63] ARM: virt: fix wrong HSCTLR.EE bit setting Date: Fri, 24 Apr 2015 13:27:36 +0800 Message-Id: <1429853281-6136-39-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 797b1a6..6c3b597 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