diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/m68k | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m68k')
| -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 | ||