diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:19:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:19:47 -0400 |
| commit | 708d0b41a26907ac83cde41dd5a75b5a2f8f1218 (patch) | |
| tree | 81fec9b45c052e98b563a93d5b6548e9e7630e34 /arch/x86/boot | |
| parent | f1d0d14120a8a6224a8aead925cf4310f48947d5 (diff) | |
| parent | 9298b815efe500b272e4084ed05eeae7a92b5340 (diff) | |
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpufeature updates from Ingo Molnar:
"This tree includes the following changes:
- Introduce DISABLED_MASK to list disabled CPU features, to simplify
CPU feature handling and avoid excessive #ifdefs
- Remove the lightly used cpu_has_pae() primitive"
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Add more disabled features
x86: Introduce disabled-features
x86: Axe the lightly-used cpu_has_pae
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/mkcpustr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c index 4579eff0ef4d..637097e66a62 100644 --- a/arch/x86/boot/mkcpustr.c +++ b/arch/x86/boot/mkcpustr.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <stdio.h> | 16 | #include <stdio.h> |
| 17 | 17 | ||
| 18 | #include "../include/asm/required-features.h" | 18 | #include "../include/asm/required-features.h" |
| 19 | #include "../include/asm/disabled-features.h" | ||
| 19 | #include "../include/asm/cpufeature.h" | 20 | #include "../include/asm/cpufeature.h" |
| 20 | #include "../kernel/cpu/capflags.c" | 21 | #include "../kernel/cpu/capflags.c" |
| 21 | 22 | ||