diff --git a/[refs] b/[refs] index a3dc4f7a3d0d..325628f624a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3838f59fc2ea9821f3ea13adb555bfc6ea43c74c +refs/heads/master: 0e7d5bb8480e10f98f89bd1d418a430393b1e995 diff --git a/trunk/arch/m68k/kernel/entry.S b/trunk/arch/m68k/kernel/entry.S index 18a9c5f4b00d..f28404d9a2bc 100644 --- a/trunk/arch/m68k/kernel/entry.S +++ b/trunk/arch/m68k/kernel/entry.S @@ -747,4 +747,10 @@ sys_call_table: .long sys_fallocate /* 320 */ .long sys_timerfd_settime .long sys_timerfd_gettime + .long sys_signalfd4 + .long sys_eventfd2 + .long sys_epoll_create1 /* 325 */ + .long sys_dup3 + .long sys_pipe2 + .long sys_inotify_init1 diff --git a/trunk/arch/m68knommu/include/asm/unistd.h b/trunk/arch/m68knommu/include/asm/unistd.h index 4ba98b9c5d79..b034a2f7b444 100644 --- a/trunk/arch/m68knommu/include/asm/unistd.h +++ b/trunk/arch/m68knommu/include/asm/unistd.h @@ -326,10 +326,16 @@ #define __NR_fallocate 320 #define __NR_timerfd_settime 321 #define __NR_timerfd_gettime 322 +#define __NR_signalfd4 323 +#define __NR_eventfd2 324 +#define __NR_epoll_create1 325 +#define __NR_dup3 326 +#define __NR_pipe2 327 +#define __NR_inotify_init1 328 #ifdef __KERNEL__ -#define NR_syscalls 323 +#define NR_syscalls 329 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR diff --git a/trunk/arch/m68knommu/kernel/syscalltable.S b/trunk/arch/m68knommu/kernel/syscalltable.S index fca2e49917a3..812f8d8b7a85 100644 --- a/trunk/arch/m68knommu/kernel/syscalltable.S +++ b/trunk/arch/m68knommu/kernel/syscalltable.S @@ -341,6 +341,12 @@ ENTRY(sys_call_table) .long sys_fallocate /* 320 */ .long sys_timerfd_settime .long sys_timerfd_gettime + .long sys_signalfd4 + .long sys_eventfd2 + .long sys_epoll_create1 /* 325 */ + .long sys_dup3 + .long sys_pipe2 + .long sys_inotify_init1 .rept NR_syscalls-(.-sys_call_table)/4 .long sys_ni_syscall diff --git a/trunk/include/asm-m68k/unistd.h b/trunk/include/asm-m68k/unistd.h index e72ba563f102..965abb8bc7ff 100644 --- a/trunk/include/asm-m68k/unistd.h +++ b/trunk/include/asm-m68k/unistd.h @@ -325,10 +325,16 @@ #define __NR_fallocate 320 #define __NR_timerfd_settime 321 #define __NR_timerfd_gettime 322 +#define __NR_signalfd4 323 +#define __NR_eventfd2 324 +#define __NR_epoll_create1 325 +#define __NR_dup3 326 +#define __NR_pipe2 327 +#define __NR_inotify_init1 328 #ifdef __KERNEL__ -#define NR_syscalls 323 +#define NR_syscalls 329 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR