From 7c234d6f72c1aa9eac9caec32a472b07cf9f9575 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 20 Feb 2008 18:11:44 +0000 Subject: [PATCH] --- yaml --- r: 86027 b: refs/heads/master c: e80af3a8dbbbf431b2070cc760699f01c5a6ac69 h: refs/heads/master i: 86025: aaae8a7b656ad1f8de332f413fa8d219bbfd1d5a 86023: ec6b01e5e18f2e5eb9e80bdd5769745554cbef83 v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/entry.S | 4 +++- trunk/include/asm-frv/unistd.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2deae5bb22a2..e7f76c3002e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d0e2baa25966cff9bcd0a6e8204e676c2bc54e1 +refs/heads/master: e80af3a8dbbbf431b2070cc760699f01c5a6ac69 diff --git a/trunk/arch/frv/kernel/entry.S b/trunk/arch/frv/kernel/entry.S index ca6a345b87e4..f36d7f4a7c25 100644 --- a/trunk/arch/frv/kernel/entry.S +++ b/trunk/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/trunk/include/asm-frv/unistd.h b/trunk/include/asm-frv/unistd.h index e8c986667532..f184eb8c047c 100644 --- a/trunk/include/asm-frv/unistd.h +++ b/trunk/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__