From patchwork Wed Feb 15 18:15:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 6801 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 2C52723FF0 for ; Wed, 15 Feb 2012 18:17:07 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id E2E85A18A2E for ; Wed, 15 Feb 2012 18:16:37 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id m50so1030683yhg.11 for ; Wed, 15 Feb 2012 10:16:37 -0800 (PST) Received: by 10.50.87.136 with SMTP id ay8mr26425460igb.25.1329329797567; Wed, 15 Feb 2012 10:16:37 -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 r19cs2667ibk; Wed, 15 Feb 2012 10:16:37 -0800 (PST) Received: by 10.216.133.204 with SMTP id q54mr3052117wei.2.1329329796212; Wed, 15 Feb 2012 10:16:36 -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.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:36 -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:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.137.27 with SMTP id x27mr12043187wei.56.1329329795330; Wed, 15 Feb 2012 10:16:35 -0800 (PST) Received: from localhost.localdomain ([213.123.120.124]) by mx.google.com with ESMTPS id dw7sm35106696wib.4.2012.02.15.10.16.29 (version=SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:34 -0800 (PST) From: Dave Martin To: Nicolas Pitre , Christoffer Dall , Marc Zyngier , Will Deacon Cc: patches@linaro.org, Dave Martin Subject: [PATCH 06/10] fixup! ARM: virt: Initial Virtualization Extensions support Date: Wed, 15 Feb 2012 18:15:59 +0000 Message-Id: <1329329763-31508-7-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: ALoCoQkDhP4U7e9FyHY8N+at6ahAbmglvMet+nsvxUiTb7W2WgzEI4YaeAZCsefiK+42xZhrXGO7 Remove needless fudging of the Thumb bit in ELF_hyp. It would be totally insane if the architecture did not allow this but to be set (though this probably needs checking) Signed-off-by: Dave Martin --- arch/arm/kernel/hyp-stub.S | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 15d556d..8d44c9b5 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -88,14 +88,10 @@ ENTRY(__hyp_stub_install_secondary) adr r4, 1f ldr r5, .L__boot_cpu_mode_offset 1: str r6, [r4, r5] @ Store the boot mode - - bic lr, lr, #1 @ clear thumb bit - @ (SPSR.T used instead) - msr elr_hyp, lr bic r7, r6, #MODE_MASK orr r7, r7, #SVC_MODE msr spsr_cxsf, r7 - + msr elr_hyp, lr eret @ return, switching to SVC mode ENDPROC(__hyp_stub_install_secondary)