diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-23 13:04:49 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-28 08:38:24 +0200 |
| commit | 6e179d64126b909f0b288fa63cdbf07c531e9b1d (patch) | |
| tree | d3b27e05dca18c669c42ba1b7833179c1b83a273 /arch/s390/include | |
| parent | b2e2f43a01bace1a25bdbae04c9f9846882b727a (diff) | |
| download | linux-6e179d64126b909f0b288fa63cdbf07c531e9b1d.tar.gz linux-6e179d64126b909f0b288fa63cdbf07c531e9b1d.tar.bz2 linux-6e179d64126b909f0b288fa63cdbf07c531e9b1d.zip | |
s390: add automatic detection of the spectre defense
Automatically decide between nobp vs. expolines if the spectre_v2=auto
kernel parameter is specified or CONFIG_EXPOLINE_AUTO=y is set.
The decision made at boot time due to CONFIG_EXPOLINE_AUTO=y being set
can be overruled with the nobp, nospec and spectre_v2 kernel parameters.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/nospec-branch.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/s390/include/asm/nospec-branch.h b/arch/s390/include/asm/nospec-branch.h index 7df48e5cf36f..35bf28fe4c64 100644 --- a/arch/s390/include/asm/nospec-branch.h +++ b/arch/s390/include/asm/nospec-branch.h @@ -6,12 +6,10 @@ #include <linux/types.h> -extern int nospec_call_disable; -extern int nospec_return_disable; +extern int nospec_disable; void nospec_init_branches(void); -void nospec_call_revert(s32 *start, s32 *end); -void nospec_return_revert(s32 *start, s32 *end); +void nospec_revert(s32 *start, s32 *end); #endif /* __ASSEMBLY__ */ |