diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:01:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:01:16 +0200 |
| commit | 0a499fc5c37e6db096969a83534fd98a2bf2b36c (patch) | |
| tree | 682875f57706b1e28bfe579372a465bd778ce3dc /arch/x86/mm | |
| parent | Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | s390/speculation: Support 'mitigations=' cmdline option (diff) | |
| download | linux-0a499fc5c37e6db096969a83534fd98a2bf2b36c.tar.xz linux-0a499fc5c37e6db096969a83534fd98a2bf2b36c.zip | |
Merge branch 'core-speculation-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull speculation mitigation update from Ingo Molnar:
"This adds the "mitigations=" bootline option, which offers a
cross-arch set of options that will work on x86, PowerPC and s390 that
will map to the arch specific option internally"
* 'core-speculation-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
s390/speculation: Support 'mitigations=' cmdline option
powerpc/speculation: Support 'mitigations=' cmdline option
x86/speculation: Support 'mitigations=' cmdline option
cpu/speculation: Add 'mitigations=' cmdline option
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pti.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 139b28a01ce4..d0255d64edce 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -35,6 +35,7 @@ #include <linux/spinlock.h> #include <linux/mm.h> #include <linux/uaccess.h> +#include <linux/cpu.h> #include <asm/cpufeature.h> #include <asm/hypervisor.h> @@ -115,7 +116,8 @@ void __init pti_check_boottime_disable(void) } } - if (cmdline_find_option_bool(boot_command_line, "nopti")) { + if (cmdline_find_option_bool(boot_command_line, "nopti") || + cpu_mitigations_off()) { pti_mode = PTI_FORCE_OFF; pti_print_if_insecure("disabled on command line."); return; |