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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index b7ba19acd3f8..2f6e127db30c 100644
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@ -346,14 +346,20 @@
 #define __NR_fanotify_init      338
 #define __NR_fanotify_mark      339
 #define __NR_prlimit64          340
+#define __NR_name_to_handle_at  341
+#define __NR_open_by_handle_at  342
+#define __NR_clock_adjtime      343
+#define __NR_syncfs             344
+#define __NR_sendmmsg           345
+#define __NR_setns              346
 
-#define __NR_LITMUS             341
+#define __NR_LITMUS             347
 
 #include "litmus/unistd_32.h"
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 341 + NR_litmus_syscalls
+#define NR_syscalls 347 + NR_litmus_syscalls
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR