diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:43:39 +0200 |
commit | b429f71bca5a4ddd914350a39572692e2ea211e0 (patch) | |
tree | 50cee6fb7b114ad89c778de87bcb44972b7326f5 /kernel/sys.c | |
parent | ace8031099f91480799b5929b4cccf2dcacc5136 (diff) | |
parent | 6fd98e775f24fd41520928d345f5db3ff52bb35d (diff) | |
download | linux-b429f71bca5a4ddd914350a39572692e2ea211e0.tar.bz2 |
Merge branch 'sched/urgent' into sched/core, 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 |