s390/facilities: move stfl information from lowcore to global data

[linux-block.git] / arch / s390 / kernel / nospec-branch.c

diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c
index 29e511f5bf0687d705d8fbde208138571d73e293..2c5c3756644b4924f74d5109b1032cab61700dab 100644 (file)
--- a/arch/s390/kernel/nospec-branch.c
+++ b/arch/s390/kernel/nospec-branch.c
@@ -17,11 +17,11 @@ static int __init nobp_setup_early(char *str)
                 * The user explicitely requested nobp=1, enable it and
                 * disable the expoline support.
                 */
-               __set_facility(82, S390_lowcore.alt_stfle_fac_list);
+               __set_facility(82, alt_stfle_fac_list);
                if (IS_ENABLED(CONFIG_EXPOLINE))
                        nospec_disable = 1;
        } else {
-               __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+               __clear_facility(82, alt_stfle_fac_list);
        }
        return 0;
 }
@@ -29,7 +29,7 @@ early_param("nobp", nobp_setup_early);
 
 static int __init nospec_setup_early(char *str)
 {
-       __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+       __clear_facility(82, alt_stfle_fac_list);
        return 0;
 }
 early_param("nospec", nospec_setup_early);
@@ -40,7 +40,7 @@ static int __init nospec_report(void)
                pr_info("Spectre V2 mitigation: etokens\n");
        if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable)
                pr_info("Spectre V2 mitigation: execute trampolines\n");
-       if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))
+       if (__test_facility(82, alt_stfle_fac_list))
                pr_info("Spectre V2 mitigation: limited branch prediction\n");
        return 0;
 }
@@ -66,14 +66,14 @@ void __init nospec_auto_detect(void)
                 */
                if (__is_defined(CC_USING_EXPOLINE))
                        nospec_disable = 1;
-               __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+               __clear_facility(82, alt_stfle_fac_list);
        } else if (__is_defined(CC_USING_EXPOLINE)) {
                /*
                 * The kernel has been compiled with expolines.
                 * Keep expolines enabled and disable nobp.
                 */
                nospec_disable = 0;
-               __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+               __clear_facility(82, alt_stfle_fac_list);
        }
        /*
         * If the kernel has not been compiled with expolines the
@@ -86,7 +86,7 @@ static int __init spectre_v2_setup_early(char *str)
 {
        if (str && !strncmp(str, "on", 2)) {
                nospec_disable = 0;
-               __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+               __clear_facility(82, alt_stfle_fac_list);
        }
        if (str && !strncmp(str, "off", 3))
                nospec_disable = 1;