diff options
author | Davide Libenzi <davidel@xmailserver.org> | 2007-05-11 01:23:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 11:29:36 -0400 |
commit | 2121e24bd8dd16b4e3f8d995428e2a748d5180cc (patch) | |
tree | c949b7712111e43e7287714a465bd13c8e9d5f02 | |
parent | fba2afaaec790dc5ab4ae8827972f342211bbb86 (diff) |
signal/timer/event: signalfd wire up x86 arches
This patch wires the signalfd system call to the x86 architectures.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/i386/kernel/syscall_table.S | 1 | ||||
-rw-r--r-- | arch/x86_64/ia32/ia32entry.S | 1 | ||||
-rw-r--r-- | include/asm-i386/unistd.h | 3 | ||||
-rw-r--r-- | include/asm-x86_64/unistd.h | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S index 0772678ceecf..d91a5f55e06a 100644 --- a/arch/i386/kernel/syscall_table.S +++ b/arch/i386/kernel/syscall_table.S | |||
@@ -320,3 +320,4 @@ ENTRY(sys_call_table) | |||
320 | .long sys_getcpu | 320 | .long sys_getcpu |
321 | .long sys_epoll_pwait | 321 | .long sys_epoll_pwait |
322 | .long sys_utimensat /* 320 */ | 322 | .long sys_utimensat /* 320 */ |
323 | .long sys_signalfd | ||
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S index f21068378272..bf8552d3a8e6 100644 --- a/arch/x86_64/ia32/ia32entry.S +++ b/arch/x86_64/ia32/ia32entry.S | |||
@@ -716,4 +716,5 @@ ia32_sys_call_table: | |||
716 | .quad sys_getcpu | 716 | .quad sys_getcpu |
717 | .quad sys_epoll_pwait | 717 | .quad sys_epoll_pwait |
718 | .quad compat_sys_utimensat /* 320 */ | 718 | .quad compat_sys_utimensat /* 320 */ |
719 | .quad sys_signalfd | ||
719 | ia32_syscall_end: | 720 | ia32_syscall_end: |
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index bd21e795197c..d8383b6a2296 100644 --- a/include/asm-i386/unistd.h +++ b/include/asm-i386/unistd.h | |||
@@ -326,10 +326,11 @@ | |||
326 | #define __NR_getcpu 318 | 326 | #define __NR_getcpu 318 |
327 | #define __NR_epoll_pwait 319 | 327 | #define __NR_epoll_pwait 319 |
328 | #define __NR_utimensat 320 | 328 | #define __NR_utimensat 320 |
329 | #define __NR_signalfd 321 | ||
329 | 330 | ||
330 | #ifdef __KERNEL__ | 331 | #ifdef __KERNEL__ |
331 | 332 | ||
332 | #define NR_syscalls 321 | 333 | #define NR_syscalls 322 |
333 | 334 | ||
334 | #define __ARCH_WANT_IPC_PARSE_VERSION | 335 | #define __ARCH_WANT_IPC_PARSE_VERSION |
335 | #define __ARCH_WANT_OLD_READDIR | 336 | #define __ARCH_WANT_OLD_READDIR |
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h index 18a0b01c8045..e12fb1a876c7 100644 --- a/include/asm-x86_64/unistd.h +++ b/include/asm-x86_64/unistd.h | |||
@@ -624,6 +624,8 @@ __SYSCALL(__NR_utimensat, sys_utimensat) | |||
624 | #define __IGNORE_getcpu /* implemented as a vsyscall */ | 624 | #define __IGNORE_getcpu /* implemented as a vsyscall */ |
625 | #define __NR_epoll_pwait 281 | 625 | #define __NR_epoll_pwait 281 |
626 | __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait) | 626 | __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait) |
627 | #define __NR_signalfd 282 | ||
628 | __SYSCALL(__NR_signalfd, sys_signalfd) | ||
627 | 629 | ||
628 | #ifndef __NO_STUBS | 630 | #ifndef __NO_STUBS |
629 | #define __ARCH_WANT_OLD_READDIR | 631 | #define __ARCH_WANT_OLD_READDIR |