diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-30 11:21:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-30 11:21:40 +0100 |
| commit | 78726ee5ff3fc76697c8754e0f546915bd61e7c6 (patch) | |
| tree | 3205c3066b632aade9bad9e1951586b065ac2192 | |
| parent | 1e423bff959e48166f5b7efca01fdb0dbdf05846 (diff) | |
| parent | a1ff5726081858a9ad98934eff7af6616c576875 (diff) | |
Merge branch 'x86/cpu' into x86/asm, to avoid conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 7ad8c9464297..bbf166e805be 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -268,6 +268,7 @@ #define X86_FEATURE_DECODEASSISTS (15*32+ 7) /* Decode Assists support */ #define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */ #define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */ +#define X86_FEATURE_AVIC (15*32+13) /* Virtual Interrupt Controller */ /* * BUG word(s) |