diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-02-14 12:48:28 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-02-14 12:49:37 +0300 |
commit | 4589f199eb68afd462bd792f730c7936fe3dafb5 (patch) | |
tree | 3c12ca1431b72ec6746df4d8b99780a3ba0d5cc5 /arch/x86/kernel/head_64.S | |
parent | 03c11eb3b16dc0058589751dfd91f254be2be613 (diff) | |
parent | 4461438a8405e800f90e0e40409e5f3d07eed381 (diff) | |
download | linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.xz |
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
Merge in pending alternatives patching infrastructure changes, before
applying more patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/head_64.S')
-rw-r--r-- | arch/x86/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index bb8ee1ce6968..cc3a81852e4a 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -622,7 +622,7 @@ SYM_CODE_END(vc_no_ghcb) #define SYM_DATA_START_PAGE_ALIGNED(name) \ SYM_START(name, SYM_L_GLOBAL, .balign PAGE_SIZE) -#ifdef CONFIG_PAGE_TABLE_ISOLATION +#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION /* * Each PGD needs to be 8k long and 8k aligned. We do not * ever go out to userspace with these, so we do not |