diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
| commit | fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3 (patch) | |
| tree | 7d3a08a88aad2e7541231f0241d97e64df4a4208 /kernel/sys.c | |
| parent | 49e73246cbe6fe0df9cae2db87f31cdc3a0b2b61 (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
| download | talos-op-linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.tar.gz talos-op-linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.zip | |
Merge tag 'v4.19-rc5' into perf/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 |
