aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch
deleted file mode 100644
index ef9f4216..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0060-x86-bugs-Fix-the-parameters-alignment-and-missing-vo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 947d5d98fb1328a22a8b502f8ce6f8e5657a5ec7 Mon Sep 17 00:00:00 2001
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date: Fri, 11 May 2018 16:50:35 -0400
-Subject: [PATCH 60/93] x86/bugs: Fix the parameters alignment and missing void
-
-commit ffed645e3be0e32f8e9ab068d257aee8d0fe8eec upstream
-
-Fixes: 7bb4d366c ("x86/bugs: Make cpu_show_common() static")
-Fixes: 24f7fc83b ("x86/bugs: Provide boot parameters for the spec_store_bypass_disable mitigation")
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/cpu/bugs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
-index 8187642..4f8c88e 100644
---- a/arch/x86/kernel/cpu/bugs.c
-+++ b/arch/x86/kernel/cpu/bugs.c
-@@ -530,7 +530,7 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)
- return mode;
- }
-
--static void ssb_select_mitigation()
-+static void ssb_select_mitigation(void)
- {
- ssb_mode = __ssb_select_mitigation();
-
-@@ -640,7 +640,7 @@ void x86_spec_ctrl_setup_ap(void)
- #ifdef CONFIG_SYSFS
-
- static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
-- char *buf, unsigned int bug)
-+ char *buf, unsigned int bug)
- {
- if (!boot_cpu_has_bug(bug))
- return sprintf(buf, "Not affected\n");
---
-2.7.4
-