public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Jones <davej@redhat.com>
To: Linux Kernel <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [X86] Fix up silly i1586 boot message.
Date: Wed, 28 May 2008 12:57:13 -0400	[thread overview]
Message-ID: <20080528165713.GA412@redhat.com> (raw)

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

             reply	other threads:[~2008-05-28 17:13 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-28 16:57 Dave Jones [this message]
2008-05-28 17:31 ` [X86] Fix up silly i1586 boot message 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080528165713.GA412@redhat.com \
    --to=davej@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox