]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Fix timerfd breakage on avr32
authorHaavard Skinnemoen <hskinnemoen@atmel.com>
Tue, 5 Feb 2008 22:22:55 +0000 (14:22 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 5 Feb 2008 22:37:15 +0000 (14:37 -0800)
Hmm. Someone removed the timerfd() syscall...

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/avr32/kernel/syscall_table.S
include/asm-avr32/unistd.h

index 75c81f2dd0b3a623fb19722dc961bd99e788ccc3..478bda4c4a09a9ac57f119b4c8529d970cbc48e2 100644 (file)
@@ -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 */
index de09009593f84eb12d3e8fa38c0450df96777b7d..89861a27543ec58554f9ad957b84801a80885595 100644 (file)
 
 #define __NR_utimensat         278
 #define __NR_signalfd          279
-#define __NR_timerfd           280
+/* 280 was __NR_timerfd */
 #define __NR_eventfd           281
 
 #ifdef __KERNEL__