| From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Date: Fri, 11 May 2018 16:50:35 -0400 |
| Subject: 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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/kernel/cpu/bugs.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/x86/kernel/cpu/bugs.c |
| +++ b/arch/x86/kernel/cpu/bugs.c |
| @@ -568,7 +568,7 @@ static enum ssb_mitigation __init __ssb_ |
| return mode; |
| } |
| |
| -static void ssb_select_mitigation() |
| +static void ssb_select_mitigation(void) |
| { |
| ssb_mode = __ssb_select_mitigation(); |
| |
| @@ -678,7 +678,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"); |