From patchwork Sat Dec 26 21:54:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Smarduch X-Patchwork-Id: 7922561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69790BEEE5 for ; Sat, 26 Dec 2015 21:58:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 074D2202D1 for ; Sat, 26 Dec 2015 21:58:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2380F20212 for ; Sat, 26 Dec 2015 21:58:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aCwpv-0001tf-K3; Sat, 26 Dec 2015 21:57:15 +0000 Received: from mailout1.w2.samsung.com ([211.189.100.11] helo=usmailout1.samsung.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aCwoq-0000yQ-Dp for linux-arm-kernel@lists.infradead.org; Sat, 26 Dec 2015 21:56:10 +0000 Received: from uscpsbgex1.samsung.com (u122.gpu85.samsung.co.kr [203.254.195.122]) by mailout1.w2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZZ00786JKZ9020@mailout1.w2.samsung.com> for linux-arm-kernel@lists.infradead.org; Sat, 26 Dec 2015 16:55:47 -0500 (EST) X-AuditID: cbfec37a-f797f6d000006fe2-ad-567f0ce3cfdb Received: from usmmp1.samsung.com ( [203.254.195.77]) by uscpsbgex1.samsung.com (USCPEXMTA) with SMTP id F9.4E.28642.3EC0F765; Sat, 26 Dec 2015 16:55:47 -0500 (EST) Received: from sisasmtp.sisa.samsung.com ([105.144.21.116]) by usmmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZZ00C0FJKZ6310@usmmp1.samsung.com>; Sat, 26 Dec 2015 16:55:47 -0500 (EST) Received: from localhost.localdomain (105.160.5.6) by SISAEX02SJ.sisa.samsung.com (105.144.21.116) with Microsoft SMTP Server (TLS) id 14.3.224.2; Sat, 26 Dec 2015 13:55:46 -0800 From: Mario Smarduch To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Subject: [PATCH v6 4/6] arm: KVM: Delete unused macros Date: Sat, 26 Dec 2015 13:54:58 -0800 Message-id: <1451166900-3711-5-git-send-email-m.smarduch@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> References: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> MIME-version: 1.0 X-Originating-IP: [105.160.5.6] X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t9hX93HPPVhBjePKlu8eP2P0WLO1EKL j6eOs1tsenyN1eLvnX9sDqwea+atYfS4c20Pm8f5TWuYPTYvqff4vEkugDWKyyYlNSezLLVI 3y6BK+Pa9vksBce5K441szUwzuLsYuTgkBAwkbjaz9fFyAlkiklcuLeerYuRi0NIYBmjxNMZ f5khnCYmiZctC1ghnG2MEmePvWYHaWET0JXYf28jmC0iECoxZflrJhCbWSBDYvbTf2BxYQEz ievbd7GAbGMRUJWYdFcCJMwr4CqxY9FeNojNchInj01mBbE5Bdwkbi95wgxiCwHVrJ12hBmi XlDix+R7YGOYBSQknn9WgihRldh28zkjxBh5iS3b29gnMArNQtIxC6FjASPTKkax0uLkguKk 9NQKQ73ixNzi0rx0veT83E2MkACv2sF456vNIUYBDkYlHt4Jz2rDhFgTy4orcw8xSnAwK4nw Vl6tCxPiTUmsrEotyo8vKs1JLT7EKM3BoiTOu0BCLlRIID2xJDU7NbUgtQgmy8TBKdXAmJXg Ili37NOniqs9rsuaPU56eE7gi5Sz61bdqfVCredp2rHYNKkV7tXui7xcyv9crVqx8YFi28Rw v2PB59hC5W/dDeIyPL68dv6vrbNnf/x2/Vqjw4eV2RIvs1qf8e1vvbnyk7bZxht/Hj7dOCvT s+1VwUPd3asbvb0TjT8s+lVkO32nLM9ZbiWW4oxEQy3mouJEAPqGblVsAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151226_135608_960815_2A5CFB5D X-CRM114-Status: UNSURE ( 9.56 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Mario Smarduch Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP set_hcptr is no longer used so delete it. Signed-off-by: Mario Smarduch Acked-by: Christoffer Dall --- arch/arm/kvm/interrupts_head.S | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index 51a5950..f4d8311 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S @@ -589,35 +589,6 @@ ARM_BE8(rev r6, r6 ) mcr p15, 4, r2, c1, c1, 3 .endm -/* Configures the HCPTR (Hyp Coprocessor Trap Register) on entry/return - * (hardware reset value is 0). Keep previous value in r2. - * An ISB is emited on vmexit/vmtrap, but executed on vmexit only if - * VFP wasn't already enabled (always executed on vmtrap). - * If a label is specified with vmexit, it is branched to if VFP wasn't - * enabled. - */ -.macro set_hcptr operation, mask, label = none - mrc p15, 4, r2, c1, c1, 2 - ldr r3, =\mask - .if \operation == vmentry - orr r3, r2, r3 @ Trap coproc-accesses defined in mask - .else - bic r3, r2, r3 @ Don't trap defined coproc-accesses - .endif - mcr p15, 4, r3, c1, c1, 2 - .if \operation != vmentry - .if \operation == vmexit - tst r2, #(HCPTR_TCP(10) | HCPTR_TCP(11)) - beq 1f - .endif - isb - .if \label != none - b \label - .endif -1: - .endif -.endm - /* Configures the HDCR (Hyp Debug Configuration Register) on entry/return * (hardware reset value is 0) */ .macro set_hdcr operation