diff --git a/[refs] b/[refs] index 3280f8e3abb4..b1c76a3ea393 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1ad7468c77ddb94b0615d5f50fa255525fde0f0 +refs/heads/master: fdb902b1225e1668315f38e96d2f439452c03a15 diff --git a/trunk/arch/i386/kernel/syscall_table.S b/trunk/arch/i386/kernel/syscall_table.S index d50634c74ed9..bf6adce52267 100644 --- a/trunk/arch/i386/kernel/syscall_table.S +++ b/trunk/arch/i386/kernel/syscall_table.S @@ -322,3 +322,4 @@ ENTRY(sys_call_table) .long sys_utimensat /* 320 */ .long sys_signalfd .long sys_timerfd + .long sys_eventfd diff --git a/trunk/arch/x86_64/ia32/ia32entry.S b/trunk/arch/x86_64/ia32/ia32entry.S index bdbed0a7e5e4..52be79beb306 100644 --- a/trunk/arch/x86_64/ia32/ia32entry.S +++ b/trunk/arch/x86_64/ia32/ia32entry.S @@ -718,4 +718,5 @@ ia32_sys_call_table: .quad compat_sys_utimensat /* 320 */ .quad sys_signalfd .quad sys_timerfd + .quad sys_eventfd ia32_syscall_end: diff --git a/trunk/include/asm-i386/unistd.h b/trunk/include/asm-i386/unistd.h index 1c8076a402e5..e84ace1ec8bf 100644 --- a/trunk/include/asm-i386/unistd.h +++ b/trunk/include/asm-i386/unistd.h @@ -328,10 +328,11 @@ #define __NR_utimensat 320 #define __NR_signalfd 321 #define __NR_timerfd 322 +#define __NR_eventfd 323 #ifdef __KERNEL__ -#define NR_syscalls 323 +#define NR_syscalls 324 #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 3e273b044457..ae1ed05f2814 100644 --- a/trunk/include/asm-x86_64/unistd.h +++ b/trunk/include/asm-x86_64/unistd.h @@ -628,6 +628,8 @@ __SYSCALL(__NR_epoll_pwait, sys_epoll_pwait) __SYSCALL(__NR_signalfd, sys_signalfd) #define __NR_timerfd 282 __SYSCALL(__NR_timerfd, sys_timerfd) +#define __NR_eventfd 283 +__SYSCALL(__NR_eventfd, sys_eventfd) #ifndef __NO_STUBS #define __ARCH_WANT_OLD_READDIR