Skip to contentSkip to conversation

SSB cleanup fix of cleanup fix.

PATCH Applied [email protected] 2 participants 2 messages May 11, 2018 – May 13, 2018

Subsystems (2)
x86 x86 hardware vulnerabilities
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 SSB cleanup fix of cleanup fix.

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 <[email protected]>
---
 arch/x86/kernel/cpu/bugs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/bugs.c +2 -2
index 784753f0b41e..bab05913f864 100644
@@ -531,7 +531,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();
 

@@ -641,7 +641,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");
Signature · 1 line
2.14.3
Applied
#1 lore raw
Quoted 5 lines · speck for konrad.wilk_at_oracle.com

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 <[email protected]>

Applied.

Thanks,

tglx