From 873ecf766ca57409d4604d3f9ad41b439b5a7d0b Mon Sep 17 00:00:00 2001
From: Davide Libenzi <davidel@xmailserver.org>
Date: Thu, 10 May 2007 22:23:14 -0700
Subject: [PATCH] --- yaml --- r: 55927 b: refs/heads/master c:
 2121e24bd8dd16b4e3f8d995428e2a748d5180cc h: refs/heads/master i:   55925:
 7330bbba63a93f66177f62631daf37c751ea6959   55923:
 44a634183d95dc43306e48f933d27bece7d882ea   55919:
 6c8a02699e41845b05ca4ae318d05d8ab56c7477 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/i386/kernel/syscall_table.S | 1 +
 trunk/arch/x86_64/ia32/ia32entry.S     | 1 +
 trunk/include/asm-i386/unistd.h        | 3 ++-
 trunk/include/asm-x86_64/unistd.h      | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 222fff8a05ee..5159904e97ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fba2afaaec790dc5ab4ae8827972f342211bbb86
+refs/heads/master: 2121e24bd8dd16b4e3f8d995428e2a748d5180cc
diff --git a/trunk/arch/i386/kernel/syscall_table.S b/trunk/arch/i386/kernel/syscall_table.S
index 0772678ceecf..d91a5f55e06a 100644
--- a/trunk/arch/i386/kernel/syscall_table.S
+++ b/trunk/arch/i386/kernel/syscall_table.S
@@ -320,3 +320,4 @@ ENTRY(sys_call_table)
 	.long sys_getcpu
 	.long sys_epoll_pwait
 	.long sys_utimensat		/* 320 */
+	.long sys_signalfd
diff --git a/trunk/arch/x86_64/ia32/ia32entry.S b/trunk/arch/x86_64/ia32/ia32entry.S
index f21068378272..bf8552d3a8e6 100644
--- a/trunk/arch/x86_64/ia32/ia32entry.S
+++ b/trunk/arch/x86_64/ia32/ia32entry.S
@@ -716,4 +716,5 @@ ia32_sys_call_table:
 	.quad sys_getcpu
 	.quad sys_epoll_pwait
 	.quad compat_sys_utimensat	/* 320 */
+	.quad sys_signalfd
 ia32_syscall_end:		
diff --git a/trunk/include/asm-i386/unistd.h b/trunk/include/asm-i386/unistd.h
index bd21e795197c..d8383b6a2296 100644
--- a/trunk/include/asm-i386/unistd.h
+++ b/trunk/include/asm-i386/unistd.h
@@ -326,10 +326,11 @@
 #define __NR_getcpu		318
 #define __NR_epoll_pwait	319
 #define __NR_utimensat		320
+#define __NR_signalfd		321
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 321
+#define NR_syscalls 322
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/trunk/include/asm-x86_64/unistd.h b/trunk/include/asm-x86_64/unistd.h
index 18a0b01c8045..e12fb1a876c7 100644
--- a/trunk/include/asm-x86_64/unistd.h
+++ b/trunk/include/asm-x86_64/unistd.h
@@ -624,6 +624,8 @@ __SYSCALL(__NR_utimensat, sys_utimensat)
 #define __IGNORE_getcpu		/* implemented as a vsyscall */
 #define __NR_epoll_pwait	281
 __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
+#define __NR_signalfd		282
+__SYSCALL(__NR_signalfd, sys_signalfd)
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR