[PATCH v3 2/3] x86/cpu/intel: Remove the F00F bug workaround notice

[Sohil Mehta]

The F00F bug workaround announcement goes through a lot of effort to
print the kernel notice exactly once. CPU bugs with workarounds
typically don't require user notifications. If needed, the presence of
the F00F bug can be determined through /proc/cpuinfo.

Remove the notice and the surrounding logic to print it once.

Signed-off-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
---
v3:
 - Get rid of the notice instead of simplifying it. (Ahmed)
v2:
 - New patch
---
 arch/x86/kernel/cpu/intel.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index e957c5a1501c..329ab1a90f5e 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -388,23 +388,15 @@ __setup("forcepae", forcepae_setup);
 
 static void intel_workarounds(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_X86_F00F_BUG
 	/*
 	 * All models of Pentium and Pentium with MMX technology CPUs
 	 * have the F0 0F bug, which lets nonprivileged users lock up the
-	 * system. Announce that the fault handler will be checking for it.
+	 * system. The fault handler always checks for it.
 	 * The Quark is also family 5, but does not have the same bug.
 	 */
-	if (c->x86_vfm >= INTEL_FAM5_START && c->x86_vfm < INTEL_QUARK_X1000) {
-		static int f00f_workaround_enabled;
-
+	if ((IS_ENABLED(CONFIG_X86_F00F_BUG)) &&
+	    (c->x86_vfm >= INTEL_FAM5_START && c->x86_vfm < INTEL_QUARK_X1000))
 		set_cpu_bug(c, X86_BUG_F00F);
-		if (!f00f_workaround_enabled) {
-			pr_notice("Intel Pentium with F0 0F bug - workaround enabled.\n");
-			f00f_workaround_enabled = 1;
-		}
-	}
-#endif
 
 	/*
 	 * SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until
-- 
2.43.0