Skip to contentSkip to conversation

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

PATCH Martin Schwidefsky 1 participant 1 message Feb 19, 2018 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Schwidefsky

author Applied
#1 lore raw
Quoted 16 lines · On Sun, 18 Feb 2018 00:10:29 +0100 Eugeniu Rosca <[email protected]> wrote:

From: Eugeniu Rosca <[email protected]>

I've accidentally stumbled upon the IS_ENABLED(EXPOLINE_*) lines, which obviously always evaluate to false. Fix this.

Fixes f19fbd5ed642 ("s390: introduce execute-trampolines for branches")
---
 arch/s390/kernel/nospec-branch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/kernel/nospec-branch.c +0 -0
index 69d7fcf48158..9aff72d3abda 100644

arch/s390/kernel/nospec-branch.c line 9

Quoted 10 lines
arch/s390/kernel/nospec-branch.c +2 -2
@@ -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)
 {

Applied, thank you!

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.