diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
| commit | edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642 (patch) | |
| tree | efdfc57e2520886842a27f2c9978c83d968ba709 /kernel/sys.c | |
| parent | x86/asm: Use CC_SET()/CC_OUT() in __cmpxchg_double() (diff) | |
| parent | Merge tag 'char-misc-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642.tar.gz linux-edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index cf5c67533ff1..123bd73046ec 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -71,9 +71,6 @@ #include <asm/io.h> #include <asm/unistd.h> -/* Hardening for Spectre-v1 */ -#include <linux/nospec.h> - #include "uid16.h" #ifndef SET_UNALIGN_CTL |