From patchwork Wed Jul 22 11:21:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 51343 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 7180220323 for ; Wed, 22 Jul 2015 11:21:29 +0000 (UTC) Received: by lbbvz8 with SMTP id vz8sf56247703lbb.2 for ; Wed, 22 Jul 2015 04:21:28 -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=oVJh8PEXPFwrljv3fWYKcFIU6NhUX3a/uHgS/z85384=; b=hFHIIcYVKiPjhw/Rymw3S36V3MxcwnVnfmbL+al4sW4Ny060L3yDedefV5XR0JNiwd Zab+a0/KQkr8lqMGaIfhX4WiwHDc7kOSq3/ervTDq1uRbk9t5kMT95k3oGGnDw7u4Ryc DnNxOLckTTr2vPUQKE0eOjUb/CnP+6dK8P8anRkuWrsa34FNCpGq77Og7kdEsWQ/kctQ hLDjnw7x7pPFqyp20gzUpIyhmHtMy83mMQDOHhryL5v+3RTu/dU3MtqxoeIp8UF5PC2L us6Ih3wR4H25+ExAgWtiRM+amKSY2TAp42VgWh9Xsb96gJTp2xaC2qzY+ZgFRUXGt45P B8bA== X-Gm-Message-State: ALoCoQmEdIe9DIcbLPtY/R5gGo11gsHDOuv6BZ/gP4cd94lCRjsirhlfNwmdNX6eWM1W84Vdv7GD X-Received: by 10.152.6.103 with SMTP id z7mr977333laz.8.1437564088501; Wed, 22 Jul 2015 04:21:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.74 with SMTP id g10ls71150lab.92.gmail; Wed, 22 Jul 2015 04:21:28 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr1809600lak.117.1437564088354; Wed, 22 Jul 2015 04:21:28 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ak6si938128lbc.59.2015.07.22.04.21.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbzr7 with SMTP id zr7so134493088lbb.1 for ; Wed, 22 Jul 2015 04:21:28 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr1801787lbc.41.1437564088263; Wed, 22 Jul 2015 04:21:28 -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 l6csp2046630lba; Wed, 22 Jul 2015 04:21:27 -0700 (PDT) X-Received: by 10.194.173.8 with SMTP id bg8mr3894226wjc.65.1437564083083; Wed, 22 Jul 2015 04:21:23 -0700 (PDT) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com. [209.85.212.179]) by mx.google.com with ESMTPS id e1si1995268wjp.38.2015.07.22.04.21.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:23 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.179 as permitted sender) client-ip=209.85.212.179; Received: by wicgb10 with SMTP id gb10so93448383wic.1 for ; Wed, 22 Jul 2015 04:21:22 -0700 (PDT) X-Received: by 10.180.103.69 with SMTP id fu5mr12615822wib.95.1437564082841; Wed, 22 Jul 2015 04:21:22 -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 j7sm1901235wjz.11.2015.07.22.04.21.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 04:21:21 -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 v3 5/5] arm64: alternative: Remove alternative_insn macro Date: Wed, 22 Jul 2015 12:21:05 +0100 Message-Id: <1437564065-4356-6-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437564065-4356-1-git-send-email-daniel.thompson@linaro.org> References: <1436536130-31438-1-git-send-email-daniel.thompson@linaro.org> <1437564065-4356-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.217.177 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 e86681ad0931..81c7369eb358 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. *