diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 22:44:18 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 22:44:18 +0100 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /arch/parisc/kernel/syscall_table.S | |
| parent | [POWERPC] scanlog_init cleanup and minor fixes (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-54f53f2b94feb72622bec7a8563fc487d9f97720.tar.xz linux-54f53f2b94feb72622bec7a8563fc487d9f97720.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 117438e9eb2a..6b5ac38f5a99 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -401,9 +401,12 @@ ENTRY_COMP(kexec_load) /* 300 */ ENTRY_COMP(utimensat) ENTRY_COMP(signalfd) - ENTRY_COMP(timerfd) + ENTRY_SAME(ni_syscall) /* was timerfd */ ENTRY_SAME(eventfd) ENTRY_COMP(fallocate) /* 305 */ + ENTRY_SAME(timerfd_create) + ENTRY_COMP(timerfd_settime) + ENTRY_COMP(timerfd_gettime) /* Nothing yet */ |