diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 12:56:49 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 12:56:49 +0300 |
| commit | 8184a8bc1ceaa97aa484d02495417373ddb18c82 (patch) | |
| tree | 2c3d4be830fc85c13a055700d622654b0192202d /arch/arm64/include | |
| parent | b7c47fd771aa19d00e093742be2672b8d963c389 (diff) | |
| parent | e92b25731ef6c21471a79404cebb0f6738096f77 (diff) | |
| download | linux-8184a8bc1ceaa97aa484d02495417373ddb18c82.tar.xz | |
Merge branch 'for-next/kpti' into for-next/core
* for-next/kpti:
arm64: correct the effect of mitigations off on kpti
arm64: entry: simplify trampoline data page
arm64: mm: install KPTI nG mappings with MMU enabled
arm64: kpti-ng: simplify page table traversal logic
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/fixmap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index daff882883f9..71ed5fdf718b 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -62,10 +62,12 @@ enum fixed_addresses { #endif /* CONFIG_ACPI_APEI_GHES */ #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 +#ifdef CONFIG_RELOCATABLE + FIX_ENTRY_TRAMP_TEXT4, /* one extra slot for the data page */ +#endif FIX_ENTRY_TRAMP_TEXT3, FIX_ENTRY_TRAMP_TEXT2, FIX_ENTRY_TRAMP_TEXT1, - FIX_ENTRY_TRAMP_DATA, #define TRAMP_VALIAS (__fix_to_virt(FIX_ENTRY_TRAMP_TEXT1)) #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ __end_of_permanent_fixed_addresses, |