summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/uapi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-14 22:17:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-14 22:17:40 -0700
commit882ebfc28c389be86535bda4a7d9e407020356bf (patch)
treee8f3ddeda13196f40040f3ba4701ece5d38c63cc /arch/parisc/include/uapi
parent1c84cd48a117486166f3597c081b170b76e5bd81 (diff)
parent9e82bf014195d6f0054982c463575cdce24292be (diff)
downloadop-kernel-dev-882ebfc28c389be86535bda4a7d9e407020356bf.zip
op-kernel-dev-882ebfc28c389be86535bda4a7d9e407020356bf.tar.gz
Merge 3.17-rc5 into tty-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/include/uapi')
-rw-r--r--arch/parisc/include/uapi/asm/unistd.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/unistd.h b/arch/parisc/include/uapi/asm/unistd.h
index 47e0e21..8667f18 100644
--- a/arch/parisc/include/uapi/asm/unistd.h
+++ b/arch/parisc/include/uapi/asm/unistd.h
@@ -830,8 +830,11 @@
#define __NR_sched_getattr (__NR_Linux + 335)
#define __NR_utimes (__NR_Linux + 336)
#define __NR_renameat2 (__NR_Linux + 337)
+#define __NR_seccomp (__NR_Linux + 338)
+#define __NR_getrandom (__NR_Linux + 339)
+#define __NR_memfd_create (__NR_Linux + 340)
-#define __NR_Linux_syscalls (__NR_renameat2 + 1)
+#define __NR_Linux_syscalls (__NR_memfd_create + 1)
#define __IGNORE_select /* newselect */
OpenPOWER on IntegriCloud