From 8fbb0b0481a4f29ee44309478afb66a7072c28d8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 14 Jun 2018 15:25:17 +0200 Subject: [PATCH] 4.9-stable patches added patches: perf-fixup.patch --- queue-4.9/perf-fixup.patch | 27 +++++++++++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 queue-4.9/perf-fixup.patch diff --git a/queue-4.9/perf-fixup.patch b/queue-4.9/perf-fixup.patch new file mode 100644 index 00000000000..02829297a15 --- /dev/null +++ b/queue-4.9/perf-fixup.patch @@ -0,0 +1,27 @@ +From foo@baz Thu Jun 14 15:23:19 CEST 2018 +Date: Thu, 14 Jun 2018 15:23:19 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: perf: sync up x86/.../cpufeatures.h + +From: Greg Kroah-Hartman + +The x86 copy of cpufeatures.h is now out of sync, so fix that. + +Signed-off-by: Greg Kroah-Hartman + +--- + tools/arch/x86/include/asm/cpufeatures.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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 */ +-#define X86_FEATURE_EAGER_FPU ( 3*32+29) /* "eagerfpu" Non lazy FPU restore */ ++/* free, was #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 */ diff --git a/queue-4.9/series b/queue-4.9/series index f9c7674d47f..05e9921c0e3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -27,3 +27,4 @@ input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch crypto-omap-sham-fix-memleak.patch +perf-fixup.patch -- 2.47.3