x86/cpu: Remove "noclflush"

suryasaimadhu · suryasaimadhu · commit f8858b5eff30 · 2022-04-04T10:17:05.000+02:00
Not really needed anymore and there's clearcpuid=. Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20220127115626.14179-7-bp@alien8.de
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1870,14 +1870,6 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c)`
`1870`	`1870`	`update_srbds_msr();`
`1871`	`1871`	`}`
`1872`	`1872`
`1873`		`-static __init int setup_noclflush(char *arg)`
`1874`		`-{`
`1875`		`- setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);`
`1876`		`- setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);`
`1877`		`- return 1;`
`1878`		`-}`
`1879`		`-__setup("noclflush", setup_noclflush);`
`1880`		`-`
`1881`	`1873`	`void print_cpu_info(struct cpuinfo_x86 *c)`
`1882`	`1874`	`{`
`1883`	`1875`	`const char *vendor = NULL;`