Skip to content

L
linux
Commit 78726ee5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1e423bff a1ff5726
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
arch/x86/include/asm/cpufeature.h
View file @ 78726ee5
...@@ -268,6 +268,7 @@ ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7