diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-16 18:09:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-16 18:09:26 -0400 |
| commit | 97fc0555dae8f4d437c8672c14d7191962429be4 (patch) | |
| tree | 7cef9de931b66e43751c6535e5fcfdbb8389f307 /arch/x86/boot/cpu.c | |
| parent | a9853dd6d285c30a3ddeb3cce8c05e1678400bef (diff) | |
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 75298fe2edca..6ec6bb6e9957 100644 --- a/arch/x86/boot/cpu.c +++ b/arch/x86/boot/cpu.c | |||
| @@ -59,17 +59,18 @@ int validate_cpu(void) | |||
| 59 | u32 e = err_flags[i]; | 59 | u32 e = err_flags[i]; |
| 60 | 60 | ||
| 61 | for (j = 0; j < 32; j++) { | 61 | for (j = 0; j < 32; j++) { |
| 62 | int n = (i << 5)+j; | 62 | if (msg_strs[0] < i || |
| 63 | if (*msg_strs < n) { | 63 | (msg_strs[0] == i && msg_strs[1] < j)) { |
| 64 | /* Skip to the next string */ | 64 | /* Skip to the next string */ |
| 65 | do { | 65 | msg_strs += 2; |
| 66 | msg_strs++; | 66 | while (*msg_strs++) |
| 67 | } while (*msg_strs); | 67 | ; |
| 68 | msg_strs++; | ||
| 69 | } | 68 | } |
| 70 | if (e & 1) { | 69 | if (e & 1) { |
| 71 | if (*msg_strs == n && msg_strs[1]) | 70 | if (msg_strs[0] == i && |
| 72 | printf("%s ", msg_strs+1); | 71 | msg_strs[1] == j && |
| 72 | msg_strs[2]) | ||
| 73 | printf("%s ", msg_strs+2); | ||
| 73 | else | 74 | else |
| 74 | printf("%d:%d ", i, j); | 75 | printf("%d:%d ", i, j); |
| 75 | } | 76 | } |