diff options
| author | Will Deacon <will@kernel.org> | 2021-06-24 14:06:23 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-06-24 14:06:23 +0100 |
| commit | bd23fdba41783251c82e9b6476bcef39a37c9bbd (patch) | |
| tree | d805e8b15628b2080ef5d8b6b37fdd4ceb043cfc /arch/arm64/include/asm/processor.h | |
| parent | 2e5d34d26a906f17a773cd3c67ee91dd2118c898 (diff) | |
| parent | d053e71ac8442d4fd24fb85591489813cdb56365 (diff) | |
| download | linux-bd23fdba41783251c82e9b6476bcef39a37c9bbd.tar.bz2 | |
Merge branch 'for-next/ptrauth' into for-next/core
Allow Pointer Authentication to be configured independently for kernel
and userspace.
* for-next/ptrauth:
arm64: Conditionally configure PTR_AUTH key of the kernel.
arm64: Add ARM64_PTR_AUTH_KERNEL config option
Diffstat (limited to 'arch/arm64/include/asm/processor.h')
| -rw-r--r-- | arch/arm64/include/asm/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 7dba1c421b5b..b6517fd03d7b 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -148,8 +148,10 @@ struct thread_struct { struct debug_info debug; /* debugging */ #ifdef CONFIG_ARM64_PTR_AUTH struct ptrauth_keys_user keys_user; +#ifdef CONFIG_ARM64_PTR_AUTH_KERNEL struct ptrauth_keys_kernel keys_kernel; #endif +#endif #ifdef CONFIG_ARM64_MTE u64 gcr_user_excl; #endif |