s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)

Eugeniu Rosca · Martin Schwidefsky · commit 2cb370d615e9 · 2018-02-19T08:00:06.000+01:00
I've accidentally stumbled upon the IS_ENABLED(EXPOLINE_*) lines, which obviously always evaluate to false. Fix this. Fixes: f19fbd5 ("s390: introduce execute-trampolines for branches") Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c
@@ -2,8 +2,8 @@
 #include <linux/module.h>
 #include <asm/nospec-branch.h>
 
-int nospec_call_disable = IS_ENABLED(EXPOLINE_OFF);
-int nospec_return_disable = !IS_ENABLED(EXPOLINE_FULL);
+int nospec_call_disable = IS_ENABLED(CONFIG_EXPOLINE_OFF);
+int nospec_return_disable = !IS_ENABLED(CONFIG_EXPOLINE_FULL);
 
 static int __init nospectre_v2_setup_early(char *str)
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`#include <linux/module.h>`
`3`	`3`	`#include <asm/nospec-branch.h>`
`4`	`4`
`5`		`-int nospec_call_disable = IS_ENABLED(EXPOLINE_OFF);`
`6`		`-int nospec_return_disable = !IS_ENABLED(EXPOLINE_FULL);`
	`5`	`+int nospec_call_disable = IS_ENABLED(CONFIG_EXPOLINE_OFF);`
	`6`	`+int nospec_return_disable = !IS_ENABLED(CONFIG_EXPOLINE_FULL);`
`7`	`7`
`8`	`8`	`static int __init nospectre_v2_setup_early(char *str)`
`9`	`9`	`{`