diff --git a/[refs] b/[refs] index b48fc4beb3fb..d3329b9338a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cb2a7c1e95e472b5ad8cbde4d5c7bb65c532603 +refs/heads/master: 46a56c5a02430f80ef73357aa1295875c1cef2a7 diff --git a/trunk/arch/avr32/kernel/syscall_table.S b/trunk/arch/avr32/kernel/syscall_table.S index 75c81f2dd0b3..478bda4c4a09 100644 --- a/trunk/arch/avr32/kernel/syscall_table.S +++ b/trunk/arch/avr32/kernel/syscall_table.S @@ -293,6 +293,6 @@ sys_call_table: .long sys_shmctl .long sys_utimensat .long sys_signalfd - .long sys_timerfd /* 280 */ + .long sys_ni_syscall /* 280, was sys_timerfd */ .long sys_eventfd .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ diff --git a/trunk/include/asm-avr32/unistd.h b/trunk/include/asm-avr32/unistd.h index de09009593f8..89861a27543e 100644 --- a/trunk/include/asm-avr32/unistd.h +++ b/trunk/include/asm-avr32/unistd.h @@ -297,7 +297,7 @@ #define __NR_utimensat 278 #define __NR_signalfd 279 -#define __NR_timerfd 280 +/* 280 was __NR_timerfd */ #define __NR_eventfd 281 #ifdef __KERNEL__