diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:29:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 20:29:03 -0400 |
| commit | 29ca069cc6572cce62e42a27efdab01f50190616 (patch) | |
| tree | b948f5eed1691fa0bca57aa116837c8eeef0b90a /arch | |
| parent | b4615e69b6c6353878b734a8202b65efbc554df4 (diff) | |
| parent | 3e4d0cab61c88a9ae3e61151a857960397e26403 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 56ab156c48ae..0dd6c1419d8d 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -1691,6 +1691,12 @@ sys_call_table: | |||
| 1691 | data8 sys_timerfd_create // 1310 | 1691 | data8 sys_timerfd_create // 1310 |
| 1692 | data8 sys_timerfd_settime | 1692 | data8 sys_timerfd_settime |
| 1693 | data8 sys_timerfd_gettime | 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 | ||
| 1694 | 1700 | ||
| 1695 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1701 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
| 1696 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ | 1702 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |