summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavide Libenzi <davidel@xmailserver.org>2007-05-10 22:23:17 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 08:29:36 -0700
commit57ac8898508638ca6d15ecd8b911a431d673ff30 (patch)
tree0e4f5a9b5fe0e1495e9e60486dc8e0defe0dbd9d /arch
parentb215e283992899650c4271e7385c79e26fb9a88e (diff)
downloadkernel-crypto-57ac8898508638ca6d15ecd8b911a431d673ff30.tar.gz
kernel-crypto-57ac8898508638ca6d15ecd8b911a431d673ff30.tar.xz
kernel-crypto-57ac8898508638ca6d15ecd8b911a431d673ff30.zip
signal/timer/event: timerfd wire up x86 arches
This patch wires the timerfd system call to the x86 architectures. Signed-off-by: Davide Libenzi <davidel@xmailserver.org> Cc: Andi Kleen <ak@suse.de> Cc: Michael Kerrisk <mtk-manpages@gmx.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/syscall_table.S1
-rw-r--r--arch/x86_64/ia32/ia32entry.S1
2 files changed, 2 insertions, 0 deletions
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: