Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 2 deletions

diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index 1ce7d2851d90..3392de3e7be0 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -813,8 +813,16 @@
 #define __NR_perf_event_open    (__NR_Linux + 318)
 #define __NR_recvmmsg           (__NR_Linux + 319)
 #define __NR_accept4            (__NR_Linux + 320)
-
-#define __NR_Linux_syscalls     (__NR_accept4 + 1)
+#define __NR_prlimit64          (__NR_Linux + 321)
+#define __NR_fanotify_init      (__NR_Linux + 322)
+#define __NR_fanotify_mark      (__NR_Linux + 323)
+#define __NR_clock_adjtime      (__NR_Linux + 324)
+#define __NR_name_to_handle_at  (__NR_Linux + 325)
+#define __NR_open_by_handle_at  (__NR_Linux + 326)
+#define __NR_syncfs             (__NR_Linux + 327)
+#define __NR_setns              (__NR_Linux + 328)
+
+#define __NR_Linux_syscalls     (__NR_setns + 1)
 
 
 #define __IGNORE_select         /* newselect */