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>

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>
Dave Jones · H. Peter Anvin
1 parent e490517a03
Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff
arch/x86/boot/cpu.c
@@ -28,6 +28,8 @@
 	if (level == 64) {
 		return "x86-64";
 	} else {
+		if (level == 15)
+			level = 6;
 		sprintf(buf, "i%d86", level);
 		return buf;
 	}
...	...	@@ -28,6 +28,8 @@
28	28	if (level == 64) {
29	29	return "x86-64";
30	30	} else {
	31	+ if (level == 15)
	32	+ level = 6;
31	33	sprintf(buf, "i%d86", level);
32	34	return buf;
33	35	}