Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2576c999 authored by Venki Pallipadi's avatar Venki Pallipadi Committed by Ingo Molnar
Browse files

x86: fix AMDC1E and XTOPOLOGY conflict in cpufeature 

Impact: fix xsave slowdown regression

Fix two features from conflicting in feature bits.

Fixes this performance regression:

   Subject: cpu2000(both float and int) 13% regression with 2.6.28-rc1
   http://lkml.org/lkml/2008/10/28/36



Reported-by: default avatar"Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Bisected-by: default avatar"Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b342797c

arch/x86/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#define X86_FEATURE_11AP	(3*32+19) /* "" Bad local APIC aka 11AP */

#define X86_FEATURE_NOPL	(3*32+20) /* The NOPL (0F 1F) instructions */

#define X86_FEATURE_AMDC1E	(3*32+21) /* AMD C1E detected */

#define X86_FEATURE_XTOPOLOGY	(3*32+21) /* cpu topology enum extensions */

#define X86_FEATURE_XTOPOLOGY	(3*32+22) /* cpu topology enum extensions */



/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */

#define X86_FEATURE_XMM3	(4*32+ 0) /* "pni" SSE-3 */