[X86] Fix up silly i1586 boot message.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Dave Jones
Date: Wednesday, May 28, 2008 - 9:57 am

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>

diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 00e19ed..882c839 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;
 	}

-- 
http://www.codemonkey.org.uk
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[X86] Fix up silly i1586 boot message., Dave Jones, (Wed May 28, 9:57 am)
Re: [X86] Fix up silly i1586 boot message., H. Peter Anvin, (Wed May 28, 10:31 am)
Re: [X86] Fix up silly i1586 boot message., H. Peter Anvin, (Wed May 28, 10:34 am)
Re: [X86] Fix up silly i1586 boot message., Jan Engelhardt, (Wed May 28, 10:48 am)
Re: [X86] Fix up silly i1586 boot message., Maciej W. Rozycki, (Wed May 28, 10:53 am)
Re: [X86] Fix up silly i1586 boot message., Dave Jones, (Wed May 28, 10:59 am)
Re: [X86] Fix up silly i1586 boot message., Jan Engelhardt, (Wed May 28, 11:02 am)
Re: [X86] Fix up silly i1586 boot message., H. Peter Anvin, (Wed May 28, 11:11 am)
Re: [X86] Fix up silly i1586 boot message., Maciej W. Rozycki, (Wed May 28, 11:25 am)
Re: [X86] Fix up silly i1586 boot message., H. Peter Anvin, (Wed May 28, 12:30 pm)
Re: [X86] Fix up silly i1586 boot message., Maciej W. Rozycki, (Wed May 28, 5:10 pm)
Re: [X86] Fix up silly i1586 boot message., H. Peter Anvin, (Wed May 28, 5:13 pm)
Re: [X86] Fix up silly i1586 boot message., Jan Engelhardt, (Thu May 29, 2:35 am)
Re: [X86] Fix up silly i1586 boot message., Pavel Machek, (Fri May 30, 1:30 pm)
RE: [X86] Fix up silly i1586 boot message., Yuhong Bao, (Tue Oct 27, 8:08 pm)
RE: [X86] Fix up silly i1586 boot message., Yuhong Bao, (Tue Oct 27, 8:39 pm)
RE: [X86] Fix up silly i1586 boot message., Jan Engelhardt, (Wed Oct 28, 1:30 am)
RE: [X86] Fix up silly i1586 boot message., Yuhong Bao, (Wed Oct 28, 7:46 am)
Re: [X86] Fix up silly i1586 boot message., Dave Jones, (Wed Oct 28, 8:46 am)
RE: [X86] Fix up silly i1586 boot message., Yuhong Bao, (Thu Oct 29, 9:33 am)