From: Greg Kroah-Hartman Date: Thu, 11 Oct 2018 14:22:49 +0000 (+0200) Subject: Revert "perf: sync up x86/.../cpufeatures.h" X-Git-Tag: android-x86-7.1-r3~7^2~154^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de8e1e51fd4110f2eb2f102ac506e06eb95814ea;p=android-x86%2Fkernel.git Revert "perf: sync up x86/.../cpufeatures.h" This reverts commit f09a7b0eead737b33d940bf5c2509ca1441e9590 Daniel writes: Because the modification in this patch actually belongs to e63650840e8b ("x86/fpu: Finish excising 'eagerfpu'") Reported-by: Daniel Sangorrin Signed-off-by: Greg Kroah-Hartman --- diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h index fbc1474960e3..2e8a0c17a4ab 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@ -104,7 +104,7 @@ #define X86_FEATURE_EXTD_APICID ( 3*32+26) /* has extended APICID (8 bits) */ #define X86_FEATURE_AMD_DCM ( 3*32+27) /* multi-node processor */ #define X86_FEATURE_APERFMPERF ( 3*32+28) /* APERFMPERF */ -/* free, was #define X86_FEATURE_EAGER_FPU ( 3*32+29) * "eagerfpu" Non lazy FPU restore */ +#define X86_FEATURE_EAGER_FPU ( 3*32+29) /* "eagerfpu" Non lazy FPU restore */ #define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */