diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:33:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:33:34 -0700 |
| commit | 7b35fa86e47f83db27056b202463d926ff0a2c8f (patch) | |
| tree | b5f535a337e4465907a12500eb5e79e3e72bd524 /arch/sparc | |
| parent | 29ca069cc6572cce62e42a27efdab01f50190616 (diff) | |
| parent | f1373da87be917e5b2356af44764620487376a07 (diff) | |
| download | talos-obmc-linux-7b35fa86e47f83db27056b202463d926ff0a2c8f.tar.gz talos-obmc-linux-7b35fa86e47f83db27056b202463d926ff0a2c8f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Wire up new system calls.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/systbls.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 5a7c4c8345c3..e1b9233b90ab 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S @@ -80,4 +80,5 @@ sys_call_table: /*300*/ .long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy /*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait /*310*/ .long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate -/*315*/ .long sys_timerfd_settime, sys_timerfd_gettime +/*315*/ .long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1 +/*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1 |
