diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2008-02-05 14:22:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 14:37:15 -0800 |
| commit | 46a56c5a02430f80ef73357aa1295875c1cef2a7 (patch) | |
| tree | 75dd8e67bf33344c62d48af1ad79bb28cb9f2652 | |
| parent | 8cb2a7c1e95e472b5ad8cbde4d5c7bb65c532603 (diff) | |
| download | op-kernel-dev-46a56c5a02430f80ef73357aa1295875c1cef2a7.zip op-kernel-dev-46a56c5a02430f80ef73357aa1295875c1cef2a7.tar.gz | |
Fix timerfd breakage on avr32
Hmm. Someone removed the timerfd() syscall...
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/avr32/kernel/syscall_table.S | 2 | ||||
| -rw-r--r-- | include/asm-avr32/unistd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S index 75c81f2..478bda4 100644 --- a/arch/avr32/kernel/syscall_table.S +++ b/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/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h index de09009..89861a2 100644 --- a/include/asm-avr32/unistd.h +++ b/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__ |
