diff options
| author | Will Deacon <will@kernel.org> | 2020-10-07 16:36:24 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-10-07 16:36:24 +0300 |
| commit | a82e4ef0417b89c6707706b9194fb0c7872a4c6a (patch) | |
| tree | 242f70860554b3b00fd796567b8f22919e6df4f9 /arch/arm64/kernel/head.S | |
| parent | baab853229ec1f291cec6a70ed61ce93159d0997 (diff) | |
| parent | d433ab42fdc2c8a32e5df7d53833310f0ab9822c (diff) | |
| download | linux-a82e4ef0417b89c6707706b9194fb0c7872a4c6a.tar.xz | |
Merge branch 'for-next/late-arrivals' into for-next/core
Late patches for 5.10: MTE selftests, minor KCSAN preparation and removal
of some unused prototypes.
(Amit Daniel Kachhap and others)
* for-next/late-arrivals:
arm64: random: Remove no longer needed prototypes
arm64: initialize per-cpu offsets earlier
kselftest/arm64: Check mte tagged user address in kernel
kselftest/arm64: Verify KSM page merge for MTE pages
kselftest/arm64: Verify all different mmap MTE options
kselftest/arm64: Check forked child mte memory accessibility
kselftest/arm64: Verify mte tag inclusion via prctl
kselftest/arm64: Add utilities and a test to validate mte memory
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index d8d9caf02834..e28c9d4e5278 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -448,6 +448,8 @@ SYM_FUNC_START_LOCAL(__primary_switched) bl __pi_memset dsb ishst // Make zero page visible to PTW + bl init_this_cpu_offset + #ifdef CONFIG_KASAN bl kasan_early_init #endif @@ -754,6 +756,7 @@ SYM_FUNC_START_LOCAL(__secondary_switched) ptrauth_keys_init_cpu x2, x3, x4, x5 #endif + bl init_this_cpu_offset b secondary_start_kernel SYM_FUNC_END(__secondary_switched) |