diff options
author | Tony Lindgren <tony@atomide.com> | 2015-11-12 18:58:21 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-11-12 18:58:21 +0100 |
commit | ff6d03b9d9cad592320ce21e9b22befe56ebe6b6 (patch) | |
tree | da02d83177a107f92c446dbf7a93bdc1bac96cdf /arch/parisc/kernel/syscall_table.S | |
parent | bus: omap-ocp2scp: Fix module alias (diff) | |
parent | ARM: OMAP: DRA7: hwmod: Add data for McASP3 (diff) | |
download | linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.tar.xz linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.zip |
Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
-rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 8eefb12d1d33..78c3ef8c348d 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -438,6 +438,8 @@ ENTRY_SAME(memfd_create) /* 340 */ ENTRY_SAME(bpf) ENTRY_COMP(execveat) + ENTRY_SAME(membarrier) + ENTRY_SAME(userfaultfd) .ifne (. - 90b) - (__NR_Linux_syscalls * (91b - 90b)) |