2024-04-09 23:08:27

by Daniel Sneddon

Subject: [PATCH] x86/bugs: Fix return type of spectre_bhi_state()

The definition of spectre_bhi_state() incorrectly returns a const char
* const. This causes the a compiler warning when building with W=1.

warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
2812 | static const char * const spectre_bhi_state(void)

Remove the const qualifier from the pointer.

Fixes: ec9404e40e8f ("x86/bhi: Add BHI mitigation knob")
Reported-by: Sean Christopherson <[email protected]>
Signed-off-by: Daniel Sneddon <[email protected]>
---
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 e1775debeafe..7e4a706cad80 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2809,7 +2809,7 @@ static char *pbrsb_eibrs_state(void)
}
}

-static const char * const spectre_bhi_state(void)
+static const char *spectre_bhi_state(void)
{
if (!boot_cpu_has_bug(X86_BUG_BHI))
return "; BHI: Not affected";
--
2.25.1

2024-04-10 05:23:25

by tip-bot2 for Alexey Makhalov

Subject: [tip: x86/urgent] x86/bugs: Fix return type of spectre_bhi_state()

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: 04f4230e2f86a4e961ea5466eda3db8c1762004d
Gitweb: https://git.kernel.org/tip/04f4230e2f86a4e961ea5466eda3db8c1762004d
Author: Daniel Sneddon <[email protected]>
AuthorDate: Tue, 09 Apr 2024 16:08:05 -07:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Wed, 10 Apr 2024 07:05:04 +02:00

x86/bugs: Fix return type of spectre_bhi_state()

The definition of spectre_bhi_state() incorrectly returns a const char
* const. This causes the a compiler warning when building with W=1:

warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
2812 | static const char * const spectre_bhi_state(void)

Remove the const qualifier from the pointer.

Fixes: ec9404e40e8f ("x86/bhi: Add BHI mitigation knob")
Reported-by: Sean Christopherson <[email protected]>
Signed-off-by: Daniel Sneddon <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Cc: Linus Torvalds <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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 2954637..27f5004 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2809,7 +2809,7 @@ static char *pbrsb_eibrs_state(void)
}
}

-static const char * const spectre_bhi_state(void)
+static const char *spectre_bhi_state(void)
{
if (!boot_cpu_has_bug(X86_BUG_BHI))
return "; BHI: Not affected";

2024-04-10 08:47:16

by Alexandre Chartre

Subject: Re: [PATCH] x86/bugs: Fix return type of spectre_bhi_state()

On 4/10/24 01:08, Daniel Sneddon wrote:
> The definition of spectre_bhi_state() incorrectly returns a const char
> * const. This causes the a compiler warning when building with W=1.
>
> warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
> 2812 | static const char * const spectre_bhi_state(void)
>
> Remove the const qualifier from the pointer.
>
> Fixes: ec9404e40e8f ("x86/bhi: Add BHI mitigation knob")
> Reported-by: Sean Christopherson <[email protected]>
> Signed-off-by: Daniel Sneddon <[email protected]>
> ---
> 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 e1775debeafe..7e4a706cad80 100644
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -2809,7 +2809,7 @@ static char *pbrsb_eibrs_state(void)
> }
> }
>
> -static const char * const spectre_bhi_state(void)
> +static const char *spectre_bhi_state(void)
> {
> if (!boot_cpu_has_bug(X86_BUG_BHI))
> return "; BHI: Not affected";

Reviewed-by: Alexandre Chartre <[email protected]>

alex.