This is a note to let you know that I've just added the patch titled
s390/speculation: Fix build error caused by bad backport
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-speculation-fix-build-error-caused-by-bad-backport.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From linux@xxxxxxxxxxxx Wed May 15 18:41:33 2019
From: Guenter Roeck <linux@xxxxxxxxxxxx>
Date: Wed, 15 May 2019 09:26:38 -0700
Subject: s390/speculation: Fix build error caused by bad backport
To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx, torvalds@xxxxxxxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, shuah@xxxxxxxxxx, patches@xxxxxxxxxxxx, ben.hutchings@xxxxxxxxxxxxxxx, lkft-triage@xxxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx
Message-ID: <20190515162638.GA25612@xxxxxxxxxxxx>
Content-Disposition: inline
From: Guenter Roeck <linux@xxxxxxxxxxxx>
The backport of commit 0336e04a6520 ("s390/speculation: Support
'mitigations=' cmdline option") introduces a build error. Fix it up.
Fixes: 91788fcb21d0 ("s390/speculation: Support 'mitigations=' cmdline option")
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/s390/kernel/nospec-branch.c | 1 +
1 file changed, 1 insertion(+)
--- a/arch/s390/kernel/nospec-branch.c
+++ b/arch/s390/kernel/nospec-branch.c
@@ -66,6 +66,7 @@ void __init nospec_auto_detect(void)
if (IS_ENABLED(CC_USING_EXPOLINE))
nospec_disable = 1;
__clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+ }
if (IS_ENABLED(CC_USING_EXPOLINE)) {
/*
* The kernel has been compiled with expolines.
Patches currently in stable-queue which might be from linux@xxxxxxxxxxxx are
queue-4.14/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
queue-4.14/s390-speculation-fix-build-error-caused-by-bad-backport.patch
