public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [X86] Fix up silly i1586 boot message.
@ 2008-05-28 16:57 Dave Jones
  2008-05-28 17:31 ` H. Peter Anvin
                   ` (2 more replies)
  0 siblings, 3 replies; 20+ messages in thread
From: Dave Jones @ 2008-05-28 16:57 UTC (permalink / raw)
  To: Linux Kernel; +Cc: Ingo Molnar, H. Peter Anvin, Thomas Gleixner

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

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2009-10-29 16:33 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-28 16:57 [X86] Fix up silly i1586 boot message Dave Jones
2008-05-28 17:31 ` H. Peter Anvin
2008-05-28 17:34 ` H. Peter Anvin
2008-05-28 17:48 ` Jan Engelhardt
2008-05-28 17:53   ` Maciej W. Rozycki
2008-05-28 18:02     ` Jan Engelhardt
2008-05-28 18:25       ` Maciej W. Rozycki
2008-05-28 19:30         ` H. Peter Anvin
2008-05-29  0:10           ` Maciej W. Rozycki
2008-05-29  0:13             ` H. Peter Anvin
2008-05-29  9:35               ` Jan Engelhardt
2008-05-30 20:30                 ` Pavel Machek
2009-10-28  3:08             ` Yuhong Bao
2009-10-28  8:30               ` Jan Engelhardt
2009-10-28 14:46                 ` Yuhong Bao
2009-10-28 15:46                 ` Dave Jones
2009-10-29 16:33                   ` Yuhong Bao
2009-10-28  3:39             ` Yuhong Bao
2008-05-28 17:59   ` Dave Jones
2008-05-28 18:11     ` H. Peter Anvin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox