summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2008-05-28 18:57:13 +0200
committerH. Peter Anvin <hpa@zytor.com>2008-05-28 19:34:12 +0200
commitc7d624d1ee7b77622305bd638755394e4d3f2d2f (patch)
tree9bba05033f945f6284ddab7a5da55842e398914c /arch/x86/boot
parentLinux 2.6.26-rc4 (diff)
downloadlinux-c7d624d1ee7b77622305bd638755394e4d3f2d2f.tar.xz
linux-c7d624d1ee7b77622305bd638755394e4d3f2d2f.zip
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>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 00e19edd852c..92d6fd73dc7d 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;
}