]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
s390/speculation: Fix build error caused by bad backport
authorGuenter Roeck <linux@roeck-us.net>
Wed, 15 May 2019 16:26:38 +0000 (09:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2019 17:42:35 +0000 (19:42 +0200)
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@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/s390/kernel/nospec-branch.c

index 83e5976885623b39ff09b09966c5b8cb1c4bb05e..6956902bba122a7dbe553ca2a10fae56842ca8b4 100644 (file)
@@ -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.