tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Wire up new system calls

Linus Torvalds 29ca069c b4615e69

+13 -1
unified split
+6
arch/ia64/kernel/entry.S
··· 1691 data8 sys_timerfd_create // 1310 1692 data8 sys_timerfd_settime 1693 data8 sys_timerfd_gettime 1694 1695 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1696 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
··· 1691 data8 sys_timerfd_create // 1310 1692 data8 sys_timerfd_settime 1693 data8 sys_timerfd_gettime 1694 + data8 sys_signalfd4 1695 + data8 sys_eventfd2 1696 + data8 sys_epoll_create1 // 1315 1697 + data8 sys_dup3 1698 + data8 sys_pipe2 1699 + data8 sys_inotify_init1 1700 1701 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1702 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
+7 -1
include/asm-ia64/unistd.h
··· 302 #define __NR_timerfd_create 1310 303 #define __NR_timerfd_settime 1311 304 #define __NR_timerfd_gettime 1312 305 306 #ifdef __KERNEL__ 307 308 309 - #define NR_syscalls 289 /* length of syscall table */ 310 311 /* 312 * The following defines stop scripts/checksyscalls.sh from complaining about
··· 302 #define __NR_timerfd_create 1310 303 #define __NR_timerfd_settime 1311 304 #define __NR_timerfd_gettime 1312 305 + #define __NR_signalfd4 1313 306 + #define __NR_eventfd2 1314 307 + #define __NR_epoll_create1 1315 308 + #define __NR_dup3 1316 309 + #define __NR_pipe2 1317 310 + #define __NR_inotify_init1 1318 311 312 #ifdef __KERNEL__ 313 314 315 + #define NR_syscalls 295 /* length of syscall table */ 316 317 /* 318 * The following defines stop scripts/checksyscalls.sh from complaining about