diff options
author | Dave Jones <davej@redhat.com> | 2008-05-28 12:57:13 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-28 13:34:12 -0400 |
commit | c7d624d1ee7b77622305bd638755394e4d3f2d2f (patch) | |
tree | 9bba05033f945f6284ddab7a5da55842e398914c | |
parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) |
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>
-rw-r--r-- | arch/x86/boot/cpu.c | 2 |
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) | |||
28 | if (level == 64) { | 28 | if (level == 64) { |
29 | return "x86-64"; | 29 | return "x86-64"; |
30 | } else { | 30 | } else { |
31 | if (level == 15) | ||
32 | level = 6; | ||
31 | sprintf(buf, "i%d86", level); | 33 | sprintf(buf, "i%d86", level); |
32 | return buf; | 34 | return buf; |
33 | } | 35 | } |