From: Daniel Thompson <daniel.thompson@linaro.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: Daniel Thompson <daniel.thompson@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, patches@linaro.org,
linaro-kernel@lists.linaro.org,
John Stultz <john.stultz@linaro.org>,
Sumit Semwal <sumit.semwal@linaro.org>,
Christoffer Dall <christoffer.dall@linaro.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Andre Przywara <andre.przywara@arm.com>
Subject: [PATCH v3 5/5] arm64: alternative: Remove alternative_insn macro
Date: Wed, 22 Jul 2015 12:21:05 +0100 [thread overview]
Message-ID: <1437564065-4356-6-git-send-email-daniel.thompson@linaro.org> (raw)
In-Reply-To: <1437564065-4356-1-git-send-email-daniel.thompson@linaro.org>
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 <daniel.thompson@linaro.org>
---
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.
*
--
2.4.3
prev parent reply other threads:[~2015-07-22 11:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 13:48 [PATCH] arm64: alternative: Provide if/else/endif assembler macros Daniel Thompson
2015-07-16 18:19 ` Will Deacon
2015-07-17 10:42 ` Daniel Thompson
2015-07-20 15:09 ` [PATCH v2 0/5] " Daniel Thompson
2015-07-20 15:10 ` [PATCH v2 1/5] " Daniel Thompson
2015-07-20 17:12 ` Will Deacon
2015-07-22 11:08 ` Daniel Thompson
2015-07-20 15:10 ` [PATCH v2 2/5] arm64: mm: Adopt new alternative " Daniel Thompson
2015-07-20 15:10 ` [PATCH v2 3/5] arm64: kernel: " Daniel Thompson
2015-07-20 15:10 ` [PATCH v2 4/5] arm64: kvm: " Daniel Thompson
2015-07-20 15:10 ` [PATCH v2 5/5] arm64: alternative: Remove alternative_insn macro Daniel Thompson
2015-07-22 11:21 ` [PATCH v3 0/5] arm64: alternative: Provide if/else/endif assembler macros Daniel Thompson
2015-07-22 11:21 ` [PATCH v3 1/5] " Daniel Thompson
2015-07-22 11:21 ` [PATCH v3 2/5] arm64: mm: Adopt new alternative " Daniel Thompson
2015-07-22 11:21 ` [PATCH v3 3/5] arm64: kernel: " Daniel Thompson
2015-07-22 11:21 ` [PATCH v3 4/5] arm64: kvm: " Daniel Thompson
2015-07-22 15:17 ` Will Deacon
2015-07-22 15:55 ` Marc Zyngier
2015-07-22 11:21 ` Daniel Thompson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437564065-4356-6-git-send-email-daniel.thompson@linaro.org \
--to=daniel.thompson@linaro.org \
--cc=andre.przywara@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=john.stultz@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=patches@linaro.org \
--cc=sumit.semwal@linaro.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®