aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-02-20 18:11:44 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-20 19:58:16 -0800
commite80af3a8dbbbf431b2070cc760699f01c5a6ac69 (patch)
tree5af00db3ec205e1b0f11ccb38d946d237ec86c36
parent2d0e2baa25966cff9bcd0a6e8204e676c2bc54e1 (diff)
downloadkernel_samsung_aries-e80af3a8dbbbf431b2070cc760699f01c5a6ac69.zip
kernel_samsung_aries-e80af3a8dbbbf431b2070cc760699f01c5a6ac69.tar.gz
kernel_samsung_aries-e80af3a8dbbbf431b2070cc760699f01c5a6ac69.tar.bz2
FRV: Change the timerfd syscalls to be the same as i386
Change the FRV timerfd syscalls to be the same as i386 timerfd syscalls. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/frv/kernel/entry.S4
-rw-r--r--include/asm-frv/unistd.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index ca6a345..f36d7f4 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -1494,9 +1494,11 @@ sys_call_table:
.long sys_epoll_pwait
.long sys_utimensat /* 320 */
.long sys_signalfd
- .long sys_ni_syscall
+ .long sys_timerfd_create
.long sys_eventfd
.long sys_fallocate
+ .long sys_timerfd_settime /* 325 */
+ .long sys_timerfd_gettime
syscall_table_size = (. - sys_call_table)
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index e8c9866..f184eb8 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -328,9 +328,11 @@
#define __NR_epoll_pwait 319
#define __NR_utimensat 320
#define __NR_signalfd 321
-/* #define __NR_timerfd 322 removed */
+#define __NR_timerfd_create 322
#define __NR_eventfd 323
#define __NR_fallocate 324
+#define __NR_timerfd_settime 325
+#define __NR_timerfd_gettime 326
#ifdef __KERNEL__