From patchwork Mon Jul 20 15:10:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 51286 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 85C15202B9 for ; Mon, 20 Jul 2015 15:10:38 +0000 (UTC) Received: by wixh2 with SMTP id h2sf9482697wix.0 for ; Mon, 20 Jul 2015 08:10:37 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=U/nxPEcibAkMc7XN+SaBYRAjBh/YWJEk1zZjoqFu1LE=; b=b2G5YJF4as9rWN2x9/HOZAH+UOEQNxTY2JABjzyl+YBX0okpT9hfC5uNGeZF5P2MXG VqFChZM8tsRDUIU49mEk3s2/HJr4NKeUiuY+5XNvUnu1R0OzDe7jeMqIVzTfZZA/HtsQ CsIKgiS3scy0Sgq1OtzgD+2LJirKJ8ViM65scI2oFMBPRCX6ag+zvDZjEXrv0fVrUcIx 8SHzqLkHd5D2w5Dk2a8Q53fu24xmC3lSQy2ym0agAeZV6KEVwhKwQQ4RlN3Td1vfckY5 Tj/MX2kx19UEqNF2TFO6eSsQn1rFg/ARHWEjcFsqXRuT7+NPfAC/Ypqp5Lj5er0LMCw2 yY5w== X-Gm-Message-State: ALoCoQlzt0FKbkK+vwYBC+n0rKkPLGr31dd9v2nymZiUHPNg2FFyFCF/+uzbb+a9myxqZCnFRrNG X-Received: by 10.112.98.42 with SMTP id ef10mr15144282lbb.18.1437405037859; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.2 with SMTP id t2ls147264laz.40.gmail; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) X-Received: by 10.112.120.227 with SMTP id lf3mr14529597lbb.12.1437405037657; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id cj9si18161112lad.92.2015.07.20.08.10.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagw2 with SMTP id w2so98911580lag.3 for ; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) X-Received: by 10.112.55.207 with SMTP id u15mr28066613lbp.88.1437405037569; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp853657lba; Mon, 20 Jul 2015 08:10:37 -0700 (PDT) X-Received: by 10.194.238.233 with SMTP id vn9mr60914221wjc.24.1437405026141; Mon, 20 Jul 2015 08:10:26 -0700 (PDT) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com. [209.85.212.174]) by mx.google.com with ESMTPS id jv5si13840550wid.14.2015.07.20.08.10.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.174 as permitted sender) client-ip=209.85.212.174; Received: by wicmv11 with SMTP id mv11so17774575wic.0 for ; Mon, 20 Jul 2015 08:10:25 -0700 (PDT) X-Received: by 10.180.80.9 with SMTP id n9mr22315461wix.87.1437405025899; Mon, 20 Jul 2015 08:10:25 -0700 (PDT) Received: from wychelm.lan (cpc4-aztw19-0-0-cust71.18-1.cable.virginm.net. [82.33.25.72]) by smtp.gmail.com with ESMTPSA id z9sm12254158wiv.9.2015.07.20.08.10.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2015 08:10:25 -0700 (PDT) From: Daniel Thompson To: Catalin Marinas , Will Deacon Cc: Daniel Thompson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal , Christoffer Dall , Marc Zyngier , Andre Przywara Subject: [PATCH v2 5/5] arm64: alternative: Remove alternative_insn macro Date: Mon, 20 Jul 2015 16:10:04 +0100 Message-Id: <1437405004-1296-6-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437405004-1296-1-git-send-email-daniel.thompson@linaro.org> References: <1436536130-31438-1-git-send-email-daniel.thompson@linaro.org> <1437405004-1296-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@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.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This macro has been superceded by the alterntive_if_not/else/endif macro family and is no longer used anywhere in the kerne. Remove it. Signed-off-by: Daniel Thompson --- arch/arm64/include/asm/alternative.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 31b19ad18f7e..3267f0b9104a 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -65,18 +65,6 @@ void free_alternatives_memory(void); .byte \alt_len .endm -.macro alternative_insn insn1 insn2 cap -661: \insn1 -662: .pushsection .altinstructions, "a" - altinstruction_entry 661b, 663f, \cap, 662b-661b, 664f-663f - .popsection - .pushsection .altinstr_replacement, "ax" -663: \insn2 -664: .popsection - .org . - (664b-663b) + (662b-661b) - .org . - (662b-661b) + (664b-663b) -.endm - /* * Begin an alternative code sequence. *