[MODERATED] [PATCH v15.1 1/1] [PATCH v15.1] SSB cleanup fix of cleanup fix.

[MODERATED] [PATCH v15.1 1/1] [PATCH v15.1] SSB cleanup fix of cleanup fix.

[konrad.wilk]

Fixes: 7bb4d366c ("x86/bugs: Make cpu_show_common() static")
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/kernel/cpu/bugs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 784753f0b41e..f5143fc12a45 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -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");
-- 
2.14.3

[MODERATED] Re: [PATCH v15.1 1/1] [PATCH v15.1] SSB cleanup fix of cleanup fix.

[Jiri Kosina]

On Thu, 10 May 2018, speck for konrad.wilk_at_oracle.com wrote:

> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
> index 784753f0b41e..f5143fc12a45 100644
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -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)

While you're doing with trivial prototype fixups, maybe it'd be worth to 
make ssb_select_mitigation() prototype proper ANSI C at the same time.

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 784753f0b41e..73ba66714765 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -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();
 
-- 
Jiri Kosina
SUSE Labs