diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:56:49 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:56:49 +0100 |
| commit | 8184a8bc1ceaa97aa484d02495417373ddb18c82 (patch) | |
| tree | 2c3d4be830fc85c13a055700d622654b0192202d /Documentation | |
| parent | b7c47fd771aa19d00e093742be2672b8d963c389 (diff) | |
| parent | e92b25731ef6c21471a79404cebb0f6738096f77 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 2522b11e593f..1f5f9c1c96df 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3161,7 +3161,7 @@ improves system performance, but it may also expose users to several CPU vulnerabilities. Equivalent to: nopti [X86,PPC] - kpti=0 [ARM64] + if nokaslr then kpti=0 [ARM64] nospectre_v1 [X86,PPC] nobp=0 [S390] nospectre_v2 [X86,PPC,S390,ARM64] |