]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Jun 2018 13:25:17 +0000 (15:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Jun 2018 13:25:17 +0000 (15:25 +0200)
added patches:
perf-fixup.patch

queue-4.9/perf-fixup.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/perf-fixup.patch b/queue-4.9/perf-fixup.patch
new file mode 100644 (file)
index 0000000..0282929
--- /dev/null
@@ -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 <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: perf: sync up x86/.../cpufeatures.h
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+The x86 copy of cpufeatures.h is now out of sync, so fix that.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 */
index f9c7674d47facc702bb93d4d7eb3d84a24871b73..05e9921c0e389674c538583cfb3bfc127192f017 100644 (file)
@@ -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