2023-08-09 13:31:45

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH 1/2] x86/speculation: add cpu_show_gds() prototype

From: Arnd Bergmann <[email protected]>

The newly added function has two definitions but no prototypes:

drivers/base/cpu.c:605:16: error: no previous prototype for 'cpu_show_gds' [-Werror=missing-prototypes]

Add a declaration next to the other ones for this file to avoid the
warning.

Fixes: 8974eb588283b ("x86/speculation: Add Gather Data Sampling mitigation")
Signed-off-by: Arnd Bergmann <[email protected]>
---
include/linux/cpu.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 9d43b734170d6..0abd60a7987b6 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -73,6 +73,8 @@ extern ssize_t cpu_show_retbleed(struct device *dev,
struct device_attribute *attr, char *buf);
extern ssize_t cpu_show_spec_rstack_overflow(struct device *dev,
struct device_attribute *attr, char *buf);
+extern ssize_t cpu_show_gds(struct device *dev,
+ struct device_attribute *attr, char *buf);

extern __printf(4, 5)
struct device *cpu_device_create(struct device *parent, void *drvdata,
--
2.39.2



2023-08-09 16:24:58

by Daniel Sneddon

[permalink] [raw]
Subject: Re: [PATCH 1/2] x86/speculation: add cpu_show_gds() prototype

On 8/9/23 06:04, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The newly added function has two definitions but no prototypes:
>
> drivers/base/cpu.c:605:16: error: no previous prototype for 'cpu_show_gds' [-Werror=missing-prototypes]
>
> Add a declaration next to the other ones for this file to avoid the
> warning.
>
> Fixes: 8974eb588283b ("x86/speculation: Add Gather Data Sampling mitigation")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> include/linux/cpu.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/cpu.h b/include/linux/cpu.h
> index 9d43b734170d6..0abd60a7987b6 100644
> --- a/include/linux/cpu.h
> +++ b/include/linux/cpu.h
> @@ -73,6 +73,8 @@ extern ssize_t cpu_show_retbleed(struct device *dev,
> struct device_attribute *attr, char *buf);
> extern ssize_t cpu_show_spec_rstack_overflow(struct device *dev,
> struct device_attribute *attr, char *buf);
> +extern ssize_t cpu_show_gds(struct device *dev,
> + struct device_attribute *attr, char *buf);
>
> extern __printf(4, 5)
> struct device *cpu_device_create(struct device *parent, void *drvdata,

Sorry I missed that. Shouldn't stable be CC'd here as well?

Thanks,
Dan



2023-08-09 23:22:23

by Dave Hansen

[permalink] [raw]
Subject: Re: [PATCH 1/2] x86/speculation: add cpu_show_gds() prototype

On 8/9/23 06:04, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The newly added function has two definitions but no prototypes:

Thanks for these, Arnd. We'll get these up to Linus, probably alongside
some of the other fixes for the other hardware issues that got mitigated
this week.