diff options
author | Liu Song <liusong@linux.alibaba.com> | 2022-06-24 03:20:48 +0200 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2022-06-28 16:08:01 +0200 |
commit | e92b25731ef6c21471a79404cebb0f6738096f77 (patch) | |
tree | 6b36222bd3261b50681b0a1964eb67a862182fa3 /Documentation/admin-guide | |
parent | arm64: entry: simplify trampoline data page (diff) | |
download | linux-e92b25731ef6c21471a79404cebb0f6738096f77.tar.xz linux-e92b25731ef6c21471a79404cebb0f6738096f77.zip |
arm64: correct the effect of mitigations off on kpti
If KASLR is enabled, then kpti will be forced to be enabled even if
mitigations off, so we need to adjust the description of this parameter.
Signed-off-by: Liu Song <liusong@linux.alibaba.com>
Link: https://lore.kernel.org/r/1656033648-84181-1-git-send-email-liusong@linux.alibaba.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'Documentation/admin-guide')
-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] |