diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
| commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
| tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /kernel/sys.c | |
| parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 @@ | |||
| 71 | #include <asm/io.h> | 71 | #include <asm/io.h> |
| 72 | #include <asm/unistd.h> | 72 | #include <asm/unistd.h> |
| 73 | 73 | ||
| 74 | /* Hardening for Spectre-v1 */ | ||
| 75 | #include <linux/nospec.h> | ||
| 76 | |||
| 77 | #include "uid16.h" | 74 | #include "uid16.h" |
| 78 | 75 | ||
| 79 | #ifndef SET_UNALIGN_CTL | 76 | #ifndef SET_UNALIGN_CTL |