diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 18:54:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 18:54:22 -0500 |
| commit | d5c67bac833c6c9cc713f6a27daa77dcba898dd8 (patch) | |
| tree | f8e405da36b2ad15a8f8171115243228b6cbb4da /arch/mips/kernel/scall64-n32.S | |
| parent | 989b0b930218661b504bbb056b309e2c7bcdfb86 (diff) | |
| parent | cc2d6f701bed8b5f120314e4df854827d8bac558 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] BCM47XX: Use new SSB SPROM data structure
[MIPS] WGT634U: Register MTD as platform device.
[MIPS] BCM47xx: Add defconfig file.
[MIPS] RM: fix EISA=n compilation
[MIPS] PCI: Coding style fixes for pcibios_enable_resources.
[MIPS] PCI: Port i386 PCI fixes.
[MIPS] Qemu: finish platform removal
[MIPS] Wire up the timerfd_*() o32 system calls
[MIPS] IP28: Add defconfig file
[MIPS] SB1: Fix CONFIG_SIBYTE_DMA_PAGEOPS build failure.
[MIPS] BCM1480: Remove stray function call resulting in infinite recursion
[MIPS] Fix buggy invocations of kmap_coherent()
[MIPS] Fix broken rm7000/rm9000 interrupt handling
[MIPS] Handle I-cache coherency in flush_cache_range()
[MIPS] IP27: Add missing ~ in DMA code.
[MIPS] Use find_task_by_vpid in system calls
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 9d5bcaf1b389..12940eca7893 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -404,4 +404,7 @@ EXPORT(sysn32_call_table) | |||
| 404 | PTR sys_ni_syscall | 404 | PTR sys_ni_syscall |
| 405 | PTR sys_eventfd | 405 | PTR sys_eventfd |
| 406 | PTR sys_fallocate | 406 | PTR sys_fallocate |
| 407 | PTR sys_timerfd_create | ||
| 408 | PTR sys_timerfd_gettime /* 5285 */ | ||
| 409 | PTR sys_timerfd_settime | ||
| 407 | .size sysn32_call_table,.-sysn32_call_table | 410 | .size sysn32_call_table,.-sysn32_call_table |