From dd4e3596fbee67cc40166b09fef33927fa9dd1e9 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Mon, 8 Apr 2013 17:57:44 +0200
Subject: [PATCH] --- yaml --- r: 366227 b: refs/heads/master c:
 55a36b65ee7107d6bb557c96fd202c4e90164542 h: refs/heads/master i:   366225:
 98928837bfe54e277585b6d9e0b810b4b649e9c9   366223:
 a8b2e176139535aa85666a2ccc9162e6e5ad6069 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/cpu/bugs.c | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index cca4883acc57..44c434dba6b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d7dc116e56c8a1ba4beb36d06a77a48fe5f750b
+refs/heads/master: 55a36b65ee7107d6bb557c96fd202c4e90164542
diff --git a/trunk/arch/x86/kernel/cpu/bugs.c b/trunk/arch/x86/kernel/cpu/bugs.c
index c59635ecbbb8..4112be9a4659 100644
--- a/trunk/arch/x86/kernel/cpu/bugs.c
+++ b/trunk/arch/x86/kernel/cpu/bugs.c
@@ -81,21 +81,6 @@ static void __init check_fpu(void)
 	}
 }
 
-/*
- * Check whether we are able to run this kernel safely on SMP.
- *
- * - i386 is no longer supported.
- * - In order to run on anything without a TSC, we need to be
- *   compiled for a i486.
- */
-
-static void __init check_config(void)
-{
-	if (boot_cpu_data.x86 < 4)
-		panic("Kernel requires i486+ for 'invlpg' and other features");
-}
-
-
 void __init check_bugs(void)
 {
 	identify_boot_cpu();
@@ -103,7 +88,17 @@ void __init check_bugs(void)
 	pr_info("CPU: ");
 	print_cpu_info(&boot_cpu_data);
 #endif
-	check_config();
+
+	/*
+	 * Check whether we are able to run this kernel safely on SMP.
+	 *
+	 * - i386 is no longer supported.
+	 * - In order to run on anything without a TSC, we need to be
+	 *   compiled for a i486.
+	 */
+	if (boot_cpu_data.x86 < 4)
+		panic("Kernel requires i486+ for 'invlpg' and other features");
+
 	init_utsname()->machine[1] =
 		'0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
 	alternative_instructions();