diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
| commit | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (patch) | |
| tree | 20b2dada6ef16126c8e4c372d65790cc5b757b86 /arch/alpha/kernel/systbls.S | |
| parent | 70e66a5079b2b33f142303d31581cf03f7af98fe (diff) | |
| parent | acadbfb90a54673d6c8b05aa4e93218433890411 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Convert BUG() to use unreachable()
alpha: Add minimal support for software performance events
alpha: Wire up missing/new syscalls
Diffstat (limited to 'arch/alpha/kernel/systbls.S')
| -rw-r--r-- | arch/alpha/kernel/systbls.S | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index cda6b8b3d57..09acb786e72 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S @@ -495,9 +495,23 @@ sys_call_table: .quad sys_epoll_pwait .quad sys_utimensat /* 475 */ .quad sys_signalfd - .quad sys_ni_syscall + .quad sys_ni_syscall /* sys_timerfd */ .quad sys_eventfd .quad sys_recvmmsg + .quad sys_fallocate /* 480 */ + .quad sys_timerfd_create + .quad sys_timerfd_settime + .quad sys_timerfd_gettime + .quad sys_signalfd4 + .quad sys_eventfd2 /* 485 */ + .quad sys_epoll_create1 + .quad sys_dup3 + .quad sys_pipe2 + .quad sys_inotify_init1 + .quad sys_preadv /* 490 */ + .quad sys_pwritev + .quad sys_rt_tgsigqueueinfo + .quad sys_perf_event_open .size sys_call_table, . - sys_call_table .type sys_call_table, @object |