On Wed, May 15, 2019 at 09:26:38AM -0700, Guenter Roeck wrote:
> On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 4.14.120 release.
> > There are 115 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> > Anything received after that time might be too late.
> >
>
> There is a build error with s390 builds.
>
> arch/s390/kernel/nospec-branch.c: In function 'nospec_auto_detect':
> arch/s390/kernel/nospec-branch.c:84:19: error:
> invalid storage class for function 'spectre_v2_setup_early'
>
> arch/s390/kernel/nospec-branch.c:96:27: error:
> initializer element is not constant
>
> and more. The file has merge damage in function nospec_auto_detect().
> Culprit is commit 91788fcb21d0 ("s390/speculation: Support 'mitigations='
> cmdline option"). That patch is in v4.14.119, so you'll have to patch
> it up manually. Example patch (compile tested) below.
>
> Guenter
>
> ---
> >From c4430ee29bf57cb1327d52b38acf3f616be9d7f5 Mon Sep 17 00:00:00 2001
> From: Guenter Roeck <linux@xxxxxxxxxxxx>
> Date: Wed, 15 May 2019 09:22:31 -0700
> Subject: [PATCH] s390/speculation: Fix build error caused by bad backport
>
> 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>
> ---
> arch/s390/kernel/nospec-branch.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c
> index 83e597688562..6956902bba12 100644
> --- 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.
> --
> 2.7.4
>
Yes, that backport was broken, good catch. Now queued up, thanks.
greg k-h
