diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-10-02 14:52:31 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-10-02 14:52:31 -0700 |
| commit | 8edab02386c3bb51c5acf5819218b598656b19b3 (patch) | |
| tree | 5f9303793138d2110c00ce88b1133469a1abf57a /arch/riscv/kernel/syscall_table.c | |
| parent | 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f (diff) | |
| parent | 8bb0ab3ae7a4dbe6cf32deb830cf2bdbf5736867 (diff) | |
Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into for-next
This contains a VDSO cleanup, along with a handful of VDSO fixes. These
serve as a base for the new time namespace support, but are also on
fixes.
* palmer/riscv-vdso-cleanup:
riscv/vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
riscv/vdso: Move vdso data page up front
riscv/vdso: Refactor asm/vdso.h
Diffstat (limited to 'arch/riscv/kernel/syscall_table.c')
| -rw-r--r-- | arch/riscv/kernel/syscall_table.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/riscv/kernel/syscall_table.c b/arch/riscv/kernel/syscall_table.c index a63c667c27b3..44b1420a2270 100644 --- a/arch/riscv/kernel/syscall_table.c +++ b/arch/riscv/kernel/syscall_table.c @@ -7,7 +7,6 @@ #include <linux/linkage.h> #include <linux/syscalls.h> #include <asm-generic/syscalls.h> -#include <asm/vdso.h> #include <asm/syscall.h> #undef __SYSCALL |