]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
timerfd: wire the new timerfd API to the x86 family
authorDavide Libenzi <davidel@xmailserver.org>
Tue, 5 Feb 2008 06:27:28 +0000 (22:27 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 5 Feb 2008 17:44:07 +0000 (09:44 -0800)
Wires up the new timerfd API to the x86 family.

Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/ia32/ia32entry.S
arch/x86/kernel/syscall_table_32.S
include/asm-x86/unistd_32.h
include/asm-x86/unistd_64.h

index 0db0a6291bbd06d059c654ce58f8e5d387d685c0..8022d3c695c0dcf0d4a609387d337bf8eeaac888 100644 (file)
@@ -722,7 +722,9 @@ ia32_sys_call_table:
        .quad sys_epoll_pwait
        .quad compat_sys_utimensat      /* 320 */
        .quad compat_sys_signalfd
-       .quad compat_sys_timerfd
+       .quad sys_timerfd_create
        .quad sys_eventfd
        .quad sys32_fallocate
+       .quad compat_sys_timerfd_settime        /* 325 */
+       .quad compat_sys_timerfd_gettime
 ia32_syscall_end:
index 8344c70adf615264bc509a9d6e6f959a72b771d4..adff5562f5fd4bbc40965ba8eb5f33d433f9f776 100644 (file)
@@ -321,6 +321,8 @@ ENTRY(sys_call_table)
        .long sys_epoll_pwait
        .long sys_utimensat             /* 320 */
        .long sys_signalfd
-       .long sys_timerfd
+       .long sys_timerfd_create
        .long sys_eventfd
        .long sys_fallocate
+       .long sys_timerfd_settime       /* 325 */
+       .long sys_timerfd_gettime
index 8d8f9b5adbb971a740ccf73476df86c280dd5d89..984123a68f7cc164ec78c540241546c469dbf295 100644 (file)
 #define __NR_epoll_pwait       319
 #define __NR_utimensat         320
 #define __NR_signalfd          321
-#define __NR_timerfd           322
+#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__
 
index 5ff4d3e24c348814e04a329ee5dc71c96a696784..3883ceb54ef5c144f1de6035ba670d5628a3e1cb 100644 (file)
@@ -629,12 +629,17 @@ __SYSCALL(__NR_utimensat, sys_utimensat)
 __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
 #define __NR_signalfd                          282
 __SYSCALL(__NR_signalfd, sys_signalfd)
-#define __NR_timerfd                           283
-__SYSCALL(__NR_timerfd, sys_timerfd)
+#define __NR_timerfd_create                    283
+__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
 #define __NR_eventfd                           284
 __SYSCALL(__NR_eventfd, sys_eventfd)
 #define __NR_fallocate                         285
 __SYSCALL(__NR_fallocate, sys_fallocate)
+#define __NR_timerfd_settime                   286
+__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)
+#define __NR_timerfd_gettime                   287
+__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
+
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR