diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /arch/m68k/kernel | |
| parent | cdd0972945dbcb8ea24db365d9b0e100af2a27bb (diff) | |
| parent | 84c6f6046c5a2189160a8f0dca8b90427bf690ea (diff) | |
Merge commit 'origin' into devel
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 6dfa3b3c0e2a..18a9c5f4b00d 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -742,7 +742,9 @@ sys_call_table: | |||
| 742 | .long sys_epoll_pwait /* 315 */ | 742 | .long sys_epoll_pwait /* 315 */ |
| 743 | .long sys_utimensat | 743 | .long sys_utimensat |
| 744 | .long sys_signalfd | 744 | .long sys_signalfd |
| 745 | .long sys_ni_syscall | 745 | .long sys_timerfd_create |
| 746 | .long sys_eventfd | 746 | .long sys_eventfd |
| 747 | .long sys_fallocate /* 320 */ | 747 | .long sys_fallocate /* 320 */ |
| 748 | .long sys_timerfd_settime | ||
| 749 | .long sys_timerfd_gettime | ||
| 748 | 750 | ||