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: 6828671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C32E9F1D4 for ; Mon, 20 Jul 2015 15:13:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA41F204DE for ; Mon, 20 Jul 2015 15:13:00 +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 85A0C20454 for ; Mon, 20 Jul 2015 15:12:56 +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 1ZHCii-0002Cv-CY; Mon, 20 Jul 2015 15:11:08 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZHCiJ-0001zP-MX for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2015 15:10:44 +0000 Received: by wibud3 with SMTP id ud3so99895214wib.0 for ; Mon, 20 Jul 2015 08:10:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U/nxPEcibAkMc7XN+SaBYRAjBh/YWJEk1zZjoqFu1LE=; b=OOIJBVgjHcBgEbjxtKIFodg6fRVh547q7JrRRqLP28EYwj9Q7OWKzvYQs92SdFxjZ+ Dmo0dG9vLGB2oySrtCGrKhXjJ/C/XPCck7eft3qk4rl16VnD19PpYwchM72+36+lSvwy LF3/GVD3z+pfNNEDa7Kldy1QywBk0vZij+VVeQ7lykMWoMF+HwpRnarehSLe64ciGT7U B7KJnNlIU9We1Wg0jAQqMn70GkcVCT32zxlTm8Ba6mYiU0bP5QfE8086SmbeWv7U5a7k yP9KrU0DRP8/kC+6bJ3irYSP2ZUc7T7FcVhLLfynKxREWigCx10vlaewt6I4dLQHoNtP n2aQ== X-Gm-Message-State: ALoCoQkBnBVkWuYSmisWxUwLPZUl7EGUQ+RrJqt0yuP/Uu1RMD/NO5SoVVuOZcY+tvuNys7Ax7oI 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150720_081043_904389_9EA567BF X-CRM114-Status: GOOD ( 10.54 ) X-Spam-Score: -2.6 (--) 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: Daniel Thompson , linaro-kernel@lists.linaro.org, patches@linaro.org, Marc Zyngier , Andre Przywara , linux-kernel@vger.kernel.org, John Stultz , Christoffer Dall , Sumit Semwal , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.4 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 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. *