diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /tools/arch/x86/include/asm/disabled-features.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'tools/arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 911e9358ceb1..85599ad4d024 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h | |||
| @@ -56,5 +56,7 @@ | |||
| 56 | #define DISABLED_MASK14 0 | 56 | #define DISABLED_MASK14 0 |
| 57 | #define DISABLED_MASK15 0 | 57 | #define DISABLED_MASK15 0 |
| 58 | #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) | 58 | #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) |
| 59 | #define DISABLED_MASK17 0 | ||
| 60 | #define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) | ||
| 59 | 61 | ||
| 60 | #endif /* _ASM_X86_DISABLED_FEATURES_H */ | 62 | #endif /* _ASM_X86_DISABLED_FEATURES_H */ |