[PATCH 4.4.y 083/101] x86/bugs: Fix __ssb_select_mitigation() return type
DORMANTno replies
REVIEWED: 3 (0M)
From: Srivatsa S. Bhat <hidden>
Date: 2018-07-14 09:56:17
Subsystem:
the rest, x86 architecture (32-bit and 64-bit), x86 hardware vulnerabilities · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Peter Zijlstra, Josh Poimboeuf
3 review trailers.
Possibly related (same subject, not in this thread)
- 2018-07-13 · [PATCH 4.4.y 083/101] x86/bugs: Fix __ssb_select_mitigation() return type · Srivatsa S. Bhat <hidden>
From: Jiri Kosina <redacted>
commit d66d8ff3d21667b41eddbe86b35ab411e40d8c5f upstream
__ssb_select_mitigation() returns one of the members of enum ssb_mitigation,
not ssb_mitigation_cmd; fix the prototype to reflect that.
Fixes: 24f7fc83b9204 ("x86/bugs: Provide boot parameters for the spec_store_bypass_disable mitigation")
Signed-off-by: Jiri Kosina <redacted>
Signed-off-by: Thomas Gleixner <redacted>
Signed-off-by: David Woodhouse <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Srivatsa S. Bhat <redacted>
Reviewed-by: Matt Helsley (VMware) <redacted>
Reviewed-by: Alexey Makhalov <redacted>
Reviewed-by: Bo Gan <redacted>
---
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 812e92a..5b58b76 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c@@ -466,7 +466,7 @@ static enum ssb_mitigation_cmd __init ssb_parse_cmdline(void) return cmd; } -static enum ssb_mitigation_cmd __init __ssb_select_mitigation(void) +static enum ssb_mitigation __init __ssb_select_mitigation(void) { enum ssb_mitigation mode = SPEC_STORE_BYPASS_NONE; enum ssb_mitigation_cmd cmd;