diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-23 17:09:39 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-28 08:38:23 +0200 |
commit | b2e2f43a01bace1a25bdbae04c9f9846882b727a (patch) | |
tree | d00215b5fb0845a57053000173c111efb69b7634 /arch/s390/kernel/alternative.c | |
parent | b9dd652499d645707dda2b835a905455e3718157 (diff) | |
download | linux-b2e2f43a01bace1a25bdbae04c9f9846882b727a.tar.bz2 |
s390: move nobp parameter functions to nospec-branch.c
Keep the code for the nobp parameter handling with the code for
expolines. Both are related to the spectre v2 mitigation.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/alternative.c')
-rw-r--r-- | arch/s390/kernel/alternative.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/s390/kernel/alternative.c b/arch/s390/kernel/alternative.c index 22476135f738..1abf4f35d059 100644 --- a/arch/s390/kernel/alternative.c +++ b/arch/s390/kernel/alternative.c @@ -15,29 +15,6 @@ static int __init disable_alternative_instructions(char *str) early_param("noaltinstr", disable_alternative_instructions); -static int __init nobp_setup_early(char *str) -{ - bool enabled; - int rc; - - rc = kstrtobool(str, &enabled); - if (rc) - return rc; - if (enabled && test_facility(82)) - __set_facility(82, S390_lowcore.alt_stfle_fac_list); - else - __clear_facility(82, S390_lowcore.alt_stfle_fac_list); - return 0; -} -early_param("nobp", nobp_setup_early); - -static int __init nospec_setup_early(char *str) -{ - __clear_facility(82, S390_lowcore.alt_stfle_fac_list); - return 0; -} -early_param("nospec", nospec_setup_early); - struct brcl_insn { u16 opc; s32 disp; |