diff options
| author | Tong Tiangen <tongtiangen@huawei.com> | 2022-06-21 07:26:33 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-06-28 12:11:47 +0100 |
| commit | e4208e80a353b5ee1d2ae4681bd41f62a3391958 (patch) | |
| tree | 0a6a9dfcd04db7dd74e1833eb79e67402214f0f3 | |
| parent | c4ed0d73ede96f1f9a20b5af17aa793ca91f8c4c (diff) | |
| download | linux-e4208e80a353b5ee1d2ae4681bd41f62a3391958.tar.gz linux-e4208e80a353b5ee1d2ae4681bd41f62a3391958.tar.bz2 linux-e4208e80a353b5ee1d2ae4681bd41f62a3391958.zip | |
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: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220621072638.1273594-6-tongtiangen@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | arch/arm64/include/asm/asm-extable.h | 6 | ||||
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/include/asm/asm-extable.h b/arch/arm64/include/asm/asm-extable.h index 73266553f8a2..b97213d292ce 100644 --- a/arch/arm64/include/asm/asm-extable.h +++ b/arch/arm64/include/asm/asm-extable.h @@ -75,9 +75,9 @@ * Create an exception table entry for `insn` if `fixup` is provided. Otherwise * do nothing. */ - .macro _cond_extable, insn, fixup - .ifnc \fixup, - _asm_extable \insn, \fixup + .macro _cond_uaccess_extable, insn, fixup + .ifnc \fixup, + _asm_extable_uaccess \insn, \fixup .endif .endm diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 8c5a61aeaf8e..dc422fa437c2 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -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 /* |