Commit 9659c422 authored by Zhen Lei's avatar Zhen Lei Committed by Zheng Zengkai
Browse files

Revert "arm64: alternatives: Move length validation in alternative_{insn, endif}" 

hulk inclusion
category: performance
bugzilla: https://e.gitee.com/open_euler/issues/list?issue=I4SCW7


CVE: NA

-------------------------------------------------------------------------

This reverts commit c50395ff.

Temporary rollback, which will be backported later so that other patches
can be backported without conflict.

Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 76f5237d

arch/arm64/include/asm/alternative.h

+4 −4
Original line number Diff line number Diff line
@@ -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



/*