From patchwork Wed Feb 15 18:16:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 6800 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 30C2924940 for ; Wed, 15 Feb 2012 18:17:07 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1ABE6A18A36 for ; Wed, 15 Feb 2012 18:16:48 +0000 (UTC) Received: by mail-gx0-f180.google.com with SMTP id r1so1029994ggn.11 for ; Wed, 15 Feb 2012 10:16:47 -0800 (PST) Received: by 10.50.85.231 with SMTP id k7mr13401098igz.25.1329329807751; Wed, 15 Feb 2012 10:16:47 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.80.19 with SMTP id r19cs2675ibk; Wed, 15 Feb 2012 10:16:47 -0800 (PST) Received: by 10.180.99.100 with SMTP id ep4mr37181763wib.7.1329329806625; Wed, 15 Feb 2012 10:16:46 -0800 (PST) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id k49si3197141wed.2.2012.02.15.10.16.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:46 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-ww0-f50.google.com with SMTP id dq11so1215859wgb.31 for ; Wed, 15 Feb 2012 10:16:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.94.68 with SMTP id da4mr36970497wib.22.1329329805630; Wed, 15 Feb 2012 10:16:45 -0800 (PST) Received: from localhost.localdomain ([213.123.120.124]) by mx.google.com with ESMTPS id dw7sm35106696wib.4.2012.02.15.10.16.37 (version=SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:45 -0800 (PST) From: Dave Martin To: Nicolas Pitre , Christoffer Dall , Marc Zyngier , Will Deacon Cc: patches@linaro.org, Dave Martin Subject: [PATCH 07/10] fixup! ARM: virt: Initial Virtualization Extensions support Date: Wed, 15 Feb 2012 18:16:00 +0000 Message-Id: <1329329763-31508-8-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1329329763-31508-1-git-send-email-dave.martin@linaro.org> References: <1329329763-31508-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQnpZczop4ZqFwLuPzVsFZ4py+WkvlIDF6hIPDChphqGLs36PcDBoVPELkj6UjmvBn2zPSBI Don't clobber the initial stored boot cpu mode. Previously, the mode stored in __boot_cpu_mode would be the mode of the last booted CPU, not the first. The first is possibly more useful, so store that instead. Signed-off-by: Dave Martin --- arch/arm/kernel/hyp-stub.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 8d44c9b5..83097ad 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -60,8 +60,8 @@ ENTRY(__hyp_stub_install_secondary) cmp r6, r7 beq 2f @ matches primary CPU boot mode? - orr r6, r6, #BOOT_CPU_MODE_MISMATCH - str r6, [r4, r5] + orr r7, r7, #BOOT_CPU_MODE_MISMATCH + str r7, [r4, r5] bx lr @ record what happened and give up @ otherwise ...