diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 12:25:08 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:25:08 +0100 |
| commit | 7066248c44ee4392b6831b2ede0ce57891202de0 (patch) | |
| tree | b043c40d932283f93e1bceeea56a1615c4b48f85 /arch/arm64/include/asm/uaccess.h | |
| parent | dc6bab18fb3c9dfde892cef2b1fe73565ff1f91a (diff) | |
| parent | 2d27e585147395316289c63efc932984675c65c2 (diff) | |
| download | linux-7066248c44ee4392b6831b2ede0ce57891202de0.tar.bz2 | |
Merge branch 'for-next/mte' into for-next/core
* for-next/mte:
kasan: Extend KASAN mode kernel parameter
arm64: mte: Add asymmetric mode support
arm64: mte: CPU feature detection for Asymm MTE
arm64: mte: Bitfield definitions for Asymm MTE
kasan: Remove duplicate of kasan_flag_async
arm64: kasan: mte: move GCR_EL1 switch to task switch when KASAN disabled
Diffstat (limited to 'arch/arm64/include/asm/uaccess.h')
| -rw-r--r-- | arch/arm64/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 9bc218991c5a..6e2e0b7031ab 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -191,13 +191,13 @@ static inline void __uaccess_enable_tco(void) */ static inline void __uaccess_disable_tco_async(void) { - if (system_uses_mte_async_mode()) + if (system_uses_mte_async_or_asymm_mode()) __uaccess_disable_tco(); } static inline void __uaccess_enable_tco_async(void) { - if (system_uses_mte_async_mode()) + if (system_uses_mte_async_or_asymm_mode()) __uaccess_enable_tco(); } |