Commit 6288e169 authored Apr 27, 2018 by Eugeniu Rosca Committed by Greg Kroah-Hartman Apr 29, 2018

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



[ Upstream commit 2cb370d615e9fbed9e95ed222c2c8f337181aa90 ]

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")
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1d966a6a

arch/s390/kernel/nospec-branch.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		#include <asm/facility.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)
		{