Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar 9 years ago
parent
1e423bff95 a1ff572608
commit
78726ee5ff
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      arch/x86/include/asm/cpufeature.h

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

@@ -268,6 +268,7 @@
 
 #define X86_FEATURE_DECODEASSISTS (15*32+ 7) /* Decode Assists support */
 
 #define X86_FEATURE_DECODEASSISTS (15*32+ 7) /* Decode Assists support */
 
 #define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */
 
 #define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */
 
 #define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */
 
 #define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */
 
+#define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */
 
 
 
 /*
 
 /*
 
  * BUG word(s)
 
  * BUG word(s)