diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/x86/boot/cpu.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 | } |