Merge branch 'x86/cpu' into x86/asm, to avoid conflict

Signed-off-by: N Ingo Molnar <mingo@kernel.org>

Merge branch 'x86/cpu' into x86/asm, to avoid conflict
Signed-off-by: N Ingo Molnar <mingo@kernel.org>
78726ee5 · Ingo Molnar · 1e423bff · a1ff5726 · 78726ee5
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

arch/x86/include/asm/cpufeature.h arch/x86/include/asm/cpufeature.h +1 -0

未找到文件。
--- 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)