32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From foo@baz Mon May 21 21:56:07 CEST 2018
|
|
From: Jiri Kosina <jkosina@suse.cz>
|
|
Date: Thu, 10 May 2018 22:47:18 +0200
|
|
Subject: x86/bugs: Fix __ssb_select_mitigation() return type
|
|
|
|
From: Jiri Kosina <jkosina@suse.cz>
|
|
|
|
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 <jkosina@suse.cz>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
arch/x86/kernel/cpu/bugs.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/x86/kernel/cpu/bugs.c
|
|
+++ b/arch/x86/kernel/cpu/bugs.c
|
|
@@ -468,7 +468,7 @@ static enum ssb_mitigation_cmd __init ss
|
|
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;
|