diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2021-04-15 16:00:48 +0300 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2021-04-15 16:00:48 +0300 |
| commit | a27a8816568964fcef62a3ae5f9d2228ec1ebc68 (patch) | |
| tree | 7197c94bcf5b600bb43e7aa70ba2b05a7fb82cd1 /arch/arm64/include/asm/mte.h | |
| parent | 604df13d7aadae6902d3b7f03a35bb21d887f0cf (diff) | |
| parent | b90e483938ce387c256e03fb144f82f64551847b (diff) | |
| download | linux-a27a8816568964fcef62a3ae5f9d2228ec1ebc68.tar.xz | |
Merge branch 'for-next/pac-set-get-enabled-keys' into for-next/core
* for-next/pac-set-get-enabled-keys:
: Introduce arm64 prctl(PR_PAC_{SET,GET}_ENABLED_KEYS).
arm64: pac: Optimize kernel entry/exit key installation code paths
arm64: Introduce prctl(PR_PAC_{SET,GET}_ENABLED_KEYS)
arm64: mte: make the per-task SCTLR_EL1 field usable elsewhere
Diffstat (limited to 'arch/arm64/include/asm/mte.h')
| -rw-r--r-- | arch/arm64/include/asm/mte.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h index 51006e08c1e9..bc88a1ced0d7 100644 --- a/arch/arm64/include/asm/mte.h +++ b/arch/arm64/include/asm/mte.h @@ -39,7 +39,7 @@ void mte_free_tag_storage(char *storage); void mte_sync_tags(pte_t *ptep, pte_t pte); void mte_copy_page_tags(void *kto, const void *kfrom); -void flush_mte_state(void); +void mte_thread_init_user(void); void mte_thread_switch(struct task_struct *next); void mte_suspend_enter(void); void mte_suspend_exit(void); @@ -59,7 +59,7 @@ static inline void mte_sync_tags(pte_t *ptep, pte_t pte) static inline void mte_copy_page_tags(void *kto, const void *kfrom) { } -static inline void flush_mte_state(void) +static inline void mte_thread_init_user(void) { } static inline void mte_thread_switch(struct task_struct *next) |