From: Zhen Lei <thunder.leizhen@huawei.com> hulk inclusion category: performance bugzilla: https://e.gitee.com/open_euler/issues/list?issue=I4SCW7 CVE: NA ------------------------------------------------------------------------- This reverts commit c50395ff54a66da8fb884b96832743a88839822c. Temporary rollback, which will be backported later so that other patches can be backported without conflict. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Reviewed-by: Weilong Chen <chenweilong@huawei.com> Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> --- arch/arm64/include/asm/alternative.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h index 3cb3c4ab3ea5..619db9b4c9d5 100644 --- a/arch/arm64/include/asm/alternative.h +++ b/arch/arm64/include/asm/alternative.h @@ -119,9 +119,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { } .popsection .subsection 1 663: \insn2 -664: .org . - (664b-663b) + (662b-661b) +664: .previous + .org . - (664b-663b) + (662b-661b) .org . - (662b-661b) + (664b-663b) - .previous .endif .endm @@ -191,11 +191,11 @@ static inline void apply_alternatives_module(void *start, size_t length) { } */ .macro alternative_endif 664: - .org . - (664b-663b) + (662b-661b) - .org . - (662b-661b) + (664b-663b) .if .Lasm_alt_mode==0 .previous .endif + .org . - (664b-663b) + (662b-661b) + .org . - (662b-661b) + (664b-663b) .endm /* -- 2.20.1