diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 11:44:50 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 12:39:32 +0000 |
| commit | 783f5670ee1447a28979999e905639114929104e (patch) | |
| tree | a51b759ac098a6f6c9d36ede5381d8c4ab39ac66 /arch/arm64/include | |
| parent | 1db758f92133a7700de72801a548964d353e14bf (diff) | |
| parent | d9939285fc818425ae92bd99f8c97b6b9ef3bb88 (diff) | |
Merge tag 'v5.4.57' into 5.4-2.1.x-imx
This is the 5.4.57 stable release
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/pointer_auth.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h index 7a24bad1a58b..076a4157a74f 100644 --- a/arch/arm64/include/asm/pointer_auth.h +++ b/arch/arm64/include/asm/pointer_auth.h @@ -3,7 +3,6 @@ #define __ASM_POINTER_AUTH_H #include <linux/bitops.h> -#include <linux/random.h> #include <asm/cpufeature.h> #include <asm/memory.h> @@ -30,6 +29,13 @@ struct ptrauth_keys { struct ptrauth_key apga; }; +/* + * Only include random.h once ptrauth_keys_* structures are defined + * to avoid yet another circular include hell (random.h * ends up + * including asm/smp.h, which requires ptrauth_keys_kernel). + */ +#include <linux/random.h> + static inline void ptrauth_keys_init(struct ptrauth_keys *keys) { if (system_supports_address_auth()) { |