From: Davide Libenzi Date: Fri, 11 May 2007 05:23:17 +0000 (-0700) Subject: signal/timer/event: timerfd wire up x86 arches X-Git-Tag: v2.6.22-rc1~51 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=57ac8898508638ca6d15ecd8b911a431d673ff30;p=linux-2.6-omap-h63xx.git signal/timer/event: timerfd wire up x86 arches This patch wires the timerfd system call to the x86 architectures. Signed-off-by: Davide Libenzi Cc: Andi Kleen Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S index d91a5f55e06..d50634c74ed 100644 --- a/arch/i386/kernel/syscall_table.S +++ b/arch/i386/kernel/syscall_table.S @@ -321,3 +321,4 @@ ENTRY(sys_call_table) .long sys_epoll_pwait .long sys_utimensat /* 320 */ .long sys_signalfd + .long sys_timerfd diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index bf8552d3a8e..bdbed0a7e5e 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S @@ -717,4 +717,5 @@ ia32_sys_call_table: .quad sys_epoll_pwait .quad compat_sys_utimensat /* 320 */ .quad sys_signalfd + .quad sys_timerfd ia32_syscall_end: diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index d8383b6a229..1c8076a402e 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h @@ -327,10 +327,11 @@ #define __NR_epoll_pwait 319 #define __NR_utimensat 320 #define __NR_signalfd 321 +#define __NR_timerfd 322 #ifdef __KERNEL__ -#define NR_syscalls 322 +#define NR_syscalls 323 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index e12fb1a876c..3e273b04445 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h @@ -626,6 +626,8 @@ __SYSCALL(__NR_utimensat, sys_utimensat) __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait) #define __NR_signalfd 282 __SYSCALL(__NR_signalfd, sys_signalfd) +#define __NR_timerfd 282 +__SYSCALL(__NR_timerfd, sys_timerfd) #ifndef __NO_STUBS #define __ARCH_WANT_OLD_READDIR