diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 19:57:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 19:57:32 +0200 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /arch/parisc/kernel/syscall_table.S | |
| parent | Merge branch 'for-linus' into for-3.18/core (diff) | |
| parent | blk-mq: use blk_mq_start_hw_queues() when running requeue work (diff) | |
| download | linux-6d11fb454b161a4565c57be6f1c5527235741003.tar.xz linux-6d11fb454b161a4565c57be6f1c5527235741003.zip | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 84c5d3a58fa1..b563d9c8268b 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -433,6 +433,9 @@ ENTRY_SAME(sched_getattr) /* 335 */ ENTRY_COMP(utimes) ENTRY_SAME(renameat2) + ENTRY_SAME(seccomp) + ENTRY_SAME(getrandom) + ENTRY_SAME(memfd_create) /* 340 */ /* Nothing yet */ |