diff --git a/[refs] b/[refs] index b25b05b2c858..b7eb31c00201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee7883b7466e721a72edacbcba2fe9cf449d82b2 +refs/heads/master: fc97551db9e4e9402ff2b5c94be8267b2e5f32f4 diff --git a/trunk/arch/blackfin/mach-common/entry.S b/trunk/arch/blackfin/mach-common/entry.S index c2e81a10c47b..56ff51bc8c21 100644 --- a/trunk/arch/blackfin/mach-common/entry.S +++ b/trunk/arch/blackfin/mach-common/entry.S @@ -1381,6 +1381,7 @@ ENTRY(_sys_call_table) .long _sys_set_robust_list .long _sys_get_robust_list /* 355 */ .long _sys_fallocate + .long _sys_semtimedop .rept NR_syscalls-(.-_sys_call_table)/4 .long _sys_ni_syscall .endr diff --git a/trunk/include/asm-blackfin/unistd.h b/trunk/include/asm-blackfin/unistd.h index 07ffe8b718c5..e98167358d26 100644 --- a/trunk/include/asm-blackfin/unistd.h +++ b/trunk/include/asm-blackfin/unistd.h @@ -369,8 +369,9 @@ #define __NR_set_robust_list 354 #define __NR_get_robust_list 355 #define __NR_fallocate 356 +#define __NR_semtimedop 357 -#define __NR_syscall 357 +#define __NR_syscall 358 #define NR_syscalls __NR_syscall /* Old optional stuff no one actually uses */