The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: f8858b5eff30d1b2be15ef1ea6285964013b95e6
Gitweb: https://git.kernel.org/tip/f8858b5eff30d1b2be15ef1ea6285964013b95e6
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Thu, 27 Jan 2022 12:56:26 +01:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Mon, 04 Apr 2022 10:17:05 +02:00
x86/cpu: Remove "noclflush"
Not really needed anymore and there's clearcpuid=.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220127115626.14179-7-bp@xxxxxxxxx
---
Documentation/admin-guide/kernel-parameters.txt | 2 --
arch/x86/kernel/cpu/common.c | 8 --------
2 files changed, 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a2299b2..8c18e7d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3444,8 +3444,6 @@
nocache [ARM]
- noclflush [BUGS=X86] Don't use the CLFLUSH instruction
-
delayacct [KNL] Enable per-task delay accounting
nodsp [SH] Disable hardware DSP at boot time.
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 5791f69..7dd7604 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1870,14 +1870,6 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c)
update_srbds_msr();
}
-static __init int setup_noclflush(char *arg)
-{
- setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
- setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);
- return 1;
-}
-__setup("noclflush", setup_noclflush);
-
void print_cpu_info(struct cpuinfo_x86 *c)
{
const char *vendor = NULL;
|