diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-16 15:09:26 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-16 15:09:26 -0700 |
| commit | 97fc0555dae8f4d437c8672c14d7191962429be4 (patch) | |
| tree | 7cef9de931b66e43751c6535e5fcfdbb8389f307 /arch/x86/boot/cpu.c | |
| parent | a9853dd6d285c30a3ddeb3cce8c05e1678400bef (diff) | |
| download | op-kernel-dev-97fc0555dae8f4d437c8672c14d7191962429be4.zip op-kernel-dev-97fc0555dae8f4d437c8672c14d7191962429be4.tar.gz | |
x86 setup: handle more than 8 CPU flag words
Checkin e38e05a85828dac23540cd007df5f20985388afc added a 9th CPU flag
word, but didn't adjust the boot code to match. This patch adds the
necessary boot code support.
Note: due to a typo in an #if statement, it didn't trigger the #error
this was supposed to do.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/cpu.c')
| -rw-r--r-- | arch/x86/boot/cpu.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c index 75298fe..6ec6bb6 100644 --- a/arch/x86/boot/cpu.c +++ b/arch/x86/boot/cpu.c @@ -59,17 +59,18 @@ int validate_cpu(void) u32 e = err_flags[i]; for (j = 0; j < 32; j++) { - int n = (i << 5)+j; - if (*msg_strs < n) { + if (msg_strs[0] < i || + (msg_strs[0] == i && msg_strs[1] < j)) { /* Skip to the next string */ - do { - msg_strs++; - } while (*msg_strs); - msg_strs++; + msg_strs += 2; + while (*msg_strs++) + ; } if (e & 1) { - if (*msg_strs == n && msg_strs[1]) - printf("%s ", msg_strs+1); + if (msg_strs[0] == i && + msg_strs[1] == j && + msg_strs[2]) + printf("%s ", msg_strs+2); else printf("%d:%d ", i, j); } |
