UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros"
authorAndre Przywara <andre.przywara@arm.com>
Tue, 28 Jun 2016 17:07:27 +0000 (18:07 +0100)
committerSami Tolvanen <samitolvanen@google.com>
Thu, 29 Sep 2016 17:52:56 +0000 (10:52 -0700)
commit1d8922da229f3b2b4b6a9e75ad7dd75f862462bb
tree3c1f60c0331c5cec63ce4e67d8635cea15f32c9c
parent9887915a4ecf3697d056f01f8e7fe09c853f93bb
UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros"

Commit 77ee306c0aea9 ("arm64: alternatives: add enable parameter to
conditional asm macros") extended the alternative assembly macros.
Unfortunately this does not really work as one would expect, as the
enable parameter in fact correctly protects the alternative section
magic, but not the actual code sequences.
This results in having both the original instruction(s) _and_  the
alternative ones, if enable if false.
Since there is no user of this macros anyway, just revert it.

This reverts commit 77ee306c0aea9a219daec256ad25982944affef8.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Change-Id: I608104891335dfa2dacdb364754ae2658088ddf2
(cherry picked from commit b82bfa4793cd0f8fde49b85e0ad66906682e7447)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
arch/arm64/include/asm/alternative.h