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/mkcpustr.c | |
parent | a9853dd6d285c30a3ddeb3cce8c05e1678400bef (diff) | |
download | kernel_samsung_smdk4412-97fc0555dae8f4d437c8672c14d7191962429be4.zip kernel_samsung_smdk4412-97fc0555dae8f4d437c8672c14d7191962429be4.tar.gz kernel_samsung_smdk4412-97fc0555dae8f4d437c8672c14d7191962429be4.tar.bz2 |
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/mkcpustr.c')
-rw-r--r-- | arch/x86/boot/mkcpustr.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c index 4589caa..8ef60f2 100644 --- a/arch/x86/boot/mkcpustr.c +++ b/arch/x86/boot/mkcpustr.c @@ -17,31 +17,31 @@ #include "../kernel/cpu/capflags.c" -#if NCAPFLAGS > 8 -# error "Need to adjust the boot code handling of CPUID strings" -#endif - int main(void) { - int i; + int i, j; const char *str; printf("static const char x86_cap_strs[] = \n"); - for (i = 0; i < NCAPINTS*32; i++) { - str = x86_cap_flags[i]; - - if (i == NCAPINTS*32-1) { - /* The last entry must be unconditional; this - also consumes the compiler-added null character */ - if (!str) - str = ""; - printf("\t\"\\x%02x\"\"%s\"\n", i, str); - } else if (str) { - printf("#if REQUIRED_MASK%d & (1 << %d)\n" - "\t\"\\x%02x\"\"%s\\0\"\n" - "#endif\n", - i >> 5, i & 31, i, str); + for (i = 0; i < NCAPINTS; i++) { + for (j = 0; j < 32; j++) { + str = x86_cap_flags[i*32+j]; + + if (i == NCAPINTS-1 && j == 31) { + /* The last entry must be unconditional; this + also consumes the compiler-added null + character */ + if (!str) + str = ""; + printf("\t\"\\x%02x\\x%02x\"\"%s\"\n", + i, j, str); + } else if (str) { + printf("#if REQUIRED_MASK%d & (1 << %d)\n" + "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n" + "#endif\n", + i, j, i, j, str); + } } } printf("\t;\n"); |