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/m68knommu/kernel/syscalltable.S | |
| 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/m68knommu/kernel/syscalltable.S')
| -rw-r--r-- | arch/m68knommu/kernel/syscalltable.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index 1b02b8820068..fca2e49917a3 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S | |||
| @@ -336,9 +336,11 @@ ENTRY(sys_call_table) | |||
| 336 | .long sys_epoll_pwait /* 315 */ | 336 | .long sys_epoll_pwait /* 315 */ |
| 337 | .long sys_utimensat | 337 | .long sys_utimensat |
| 338 | .long sys_signalfd | 338 | .long sys_signalfd |
| 339 | .long sys_ni_syscall | 339 | .long sys_timerfd_create |
| 340 | .long sys_eventfd | 340 | .long sys_eventfd |
| 341 | .long sys_fallocate /* 320 */ | 341 | .long sys_fallocate /* 320 */ |
| 342 | .long sys_timerfd_settime | ||
| 343 | .long sys_timerfd_gettime | ||
| 342 | 344 | ||
| 343 | .rept NR_syscalls-(.-sys_call_table)/4 | 345 | .rept NR_syscalls-(.-sys_call_table)/4 |
| 344 | .long sys_ni_syscall | 346 | .long sys_ni_syscall |