diff --git a/[refs] b/[refs] index 9f5d1c88ef91..7685a4fe1eec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f72949f679df06021c9e43886c9191494fdb007 +refs/heads/master: 3213e913b0d6baeb28aa1affbdd4bfa7efedc35f diff --git a/trunk/arch/i386/kernel/syscall_table.S b/trunk/arch/i386/kernel/syscall_table.S index a988b40e5945..1b665928336b 100644 --- a/trunk/arch/i386/kernel/syscall_table.S +++ b/trunk/arch/i386/kernel/syscall_table.S @@ -307,3 +307,5 @@ ENTRY(sys_call_table) .long sys_readlinkat /* 305 */ .long sys_fchmodat .long sys_faccessat + .long sys_pselect6 + .long sys_ppoll diff --git a/trunk/include/asm-i386/unistd.h b/trunk/include/asm-i386/unistd.h index 3400441b3f91..597496ed2aee 100644 --- a/trunk/include/asm-i386/unistd.h +++ b/trunk/include/asm-i386/unistd.h @@ -313,8 +313,10 @@ #define __NR_readlinkat 305 #define __NR_fchmodat 306 #define __NR_faccessat 307 +#define __NR_pselect6 308 +#define __NR_ppoll 309 -#define NR_syscalls 308 +#define NR_syscalls 310 /* * user-visible error numbers are in the range -1 - -128: see