aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/boot/cpu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 09:43:01 +0200
commit3c1ca43fafea41e38cb2d0c1684119af4c1de547 (patch)
tree122e41a7b9fca26ea25ea9864180f5016274a8c8 /arch/x86/boot/cpu.c
parent6924d1ab8b7bbe5ab416713f5701b3316b2df85b (diff)
parent6bcb13b35a2ea39be6c7cc0292b8ad1191b1a748 (diff)
Merge branch 'x86/setup' into x86/devel
Diffstat (limited to 'arch/x86/boot/cpu.c')
-rw-r--r--arch/x86/boot/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 00e19edd852..92d6fd73dc7 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;
}