Commit e4208e80 authored by Tong Tiangen's avatar Tong Tiangen Committed by Will Deacon
Browse files

arm64: extable: move _cond_extable to _cond_uaccess_extable 



Currently, We use _cond_extable for cache maintenance uaccess helper
caches_clean_inval_user_pou(), so this should be moved over to
EX_TYPE_UACCESS_ERR_ZERO and rename _cond_extable to _cond_uaccess_extable
for clarity.

Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220621072638.1273594-6-tongtiangen@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent c4ed0d73

arch/arm64/include/asm/asm-extable.h

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ 
 * Create an exception table entry for `insn` if `fixup` is provided. Otherwise

 * do nothing.

 */

	.macro		_cond_extable, insn, fixup

	.macro		_cond_uaccess_extable, insn, fixup

	.ifnc			\fixup,

	_asm_extable	\insn, \fixup

	_asm_extable_uaccess	\insn, \fixup

	.endif

	.endm

arch/arm64/include/asm/assembler.h

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ alternative_endif 
	b.lo	.Ldcache_op\@

	dsb	\domain



	_cond_extable .Ldcache_op\@, \fixup

	_cond_uaccess_extable .Ldcache_op\@, \fixup

	.endm



/*
@@ -462,7 +462,7 @@ alternative_endif 
	dsb	ish

	isb



	_cond_extable .Licache_op\@, \fixup

	_cond_uaccess_extable .Licache_op\@, \fixup

	.endm



/*