diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 19:30:22 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-04 19:30:22 (GMT) |
commit | 14c79092909a52b6fd6394b6ad5e7756c4f9565e (patch) | |
tree | c9ab2a50aa00c8888cc90006a0e012782b0ccc19 /arch/parisc/kernel/syscall_table.S | |
parent | 1b1050cdc5cdde43177b375b5f22dc070d45d8f8 (diff) | |
parent | a01fece2e4185ac173abd16d10304d73d47ebf00 (diff) | |
download | linux-14c79092909a52b6fd6394b6ad5e7756c4f9565e.tar.xz |
Merge branch 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"The most important change is that we reduce L1_CACHE_BYTES to 16
bytes, for which a trivial patch for XPS in the network layer was
needed. Then we wire up the sys_membarrier and userfaultfd syscalls
and added two other small cleanups"
* 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Change L1_CACHE_BYTES to 16
net/xps: Fix calculation of initial number of xps queues
parisc: reduce syslog debug output
parisc: serial/mux: Convert to uart_console_device instead of open-coded
parisc: Wire up userfaultfd syscall
parisc: allocate sys_membarrier system call number
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 8eefb12..78c3ef8 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)) |