x86/bugs: Fix the parameters alignment and missing void

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>
CVE-2018-3639 (x86)

(backported from commit ffed645e3be0e32f8e9ab068d257aee8d0fe8eec)
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 2443b9580e9449e7c4ed8cdafd32774e6b89038f..765ada5ce042dbbbe8b21d50ee0b3c74a262569e 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -490,7 +490,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();
 
@@ -599,7 +599,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");