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

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



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1e423bff a1ff5726

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -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)