From: Dave Jones <davej@redhat.com>
Date: Wed, 28 May 2008 16:57:13 +0000 (-0400)
Subject: x86: Fix up silly i1586 boot message.
X-Git-Tag: v2.6.27-rc1~1106^2~250^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7d624d1ee7b77622305bd638755394e4d3f2d2f;p=linux-2.6-omap-h63xx.git

x86: Fix up silly i1586 boot message.

Trying to boot a 64-bit kernel on a 32bit Pentium 4 gets
you an amusing message along the lines of.
"you need an x86-64, but you only have an i1586"
due to the P4 being family F.  Munge it to be 686.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 00e19edd852..92d6fd73dc7 100644
--- a/arch/x86/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
@@ -28,6 +28,8 @@ static char *cpu_name(int level)
 	if (level == 64) {
 		return "x86-64";
 	} else {
+		if (level == 15)
+			level = 6;
 		sprintf(buf, "i%d86", level);
 		return buf;
 	}