diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 02:26:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-16 02:26:48 +0300 |
| commit | 555e5986bab6715ad6e39a35aeb67a218cc80abf (patch) | |
| tree | 76527d0e133dd36cf2d4413f5aafa47ff608a57a /arch/parisc/include/uapi/asm/unistd.h | |
| parent | ec7de6567ffdc8bdcf816365ef56bc0771afb63d (diff) | |
| parent | d8f5457ab93965f0e695516ad23548954e3e9044 (diff) | |
| download | linux-555e5986bab6715ad6e39a35aeb67a218cc80abf.tar.xz | |
Merge branch 'parisc-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Changes include:
- wire up the bpf syscall
- remove CONFIG_64BIT usage from some userspace-exported header files
- use compat functions for msgctl, shmat, shmctl and semtimedop
syscalls"
* 'parisc-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Avoid using CONFIG_64BIT in userspace exported headers
parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls
parisc: Use BUILD_BUG() instead of undefined functions
parisc: Wire up bpf syscall
Diffstat (limited to 'arch/parisc/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/parisc/include/uapi/asm/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h index 8667f18be238..5f5c0373de63 100644 --- a/arch/parisc/include/uapi/asm/unistd.h +++ b/arch/parisc/include/uapi/asm/unistd.h @@ -833,8 +833,9 @@ #define __NR_seccomp (__NR_Linux + 338) #define __NR_getrandom (__NR_Linux + 339) #define __NR_memfd_create (__NR_Linux + 340) +#define __NR_bpf (__NR_Linux + 341) -#define __NR_Linux_syscalls (__NR_memfd_create + 1) +#define __NR_Linux_syscalls (__NR_bpf + 1) #define __IGNORE_select /* newselect */ |