From: Andrew Morton <akpm@linux-foundation.org>

Make this patch from Andi's tree go away for now - it mucks up the
git-newsetup merge.

Cc: Andi Kleen <ak@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/i386/Kconfig.cpu         |    2 +-
 arch/i386/kernel/verify_cpu.S |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN arch/i386/Kconfig.cpu~revert-x86_64-mm-verify-cpu-rename arch/i386/Kconfig.cpu
--- a/arch/i386/Kconfig.cpu~revert-x86_64-mm-verify-cpu-rename
+++ a/arch/i386/Kconfig.cpu
@@ -344,7 +344,7 @@ config X86_CMOV
 	depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7)
 	default y
 
-config X86_MINIMUM_CPU_FAMILY
+config X86_MINIMUM_CPU_MODEL
 	int
 	default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP
 	default "0"
diff -puN arch/i386/kernel/verify_cpu.S~revert-x86_64-mm-verify-cpu-rename arch/i386/kernel/verify_cpu.S
--- a/arch/i386/kernel/verify_cpu.S~revert-x86_64-mm-verify-cpu-rename
+++ a/arch/i386/kernel/verify_cpu.S
@@ -9,7 +9,7 @@ verify_cpu:
 	pushl	$0			# Kill any dangerous flags
 	popfl
 
-#if CONFIG_X86_MINIMUM_CPU_FAMILY >= 4
+#if CONFIG_X86_MINIMUM_CPU_MODEL >= 4
 	pushfl
 	pop	%eax
 	orl	$(1<<18),%eax		# try setting AC
@@ -75,8 +75,8 @@ verify_cpu:
 	movl    $0x1,%eax		# Does the cpu have what it takes
 	cpuid
 
-#if CONFIG_X86_MINIMUM_CPU_FAMILY > 4
-#error	add proper family checking here
+#if CONFIG_X86_MINIMUM_CPU_MODEL > 4
+#error	add proper model checking here
 #endif
 
 	andl	$REQUIRED_MASK1,%edx
_