diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /arch/mips/kernel/scall64-64.S | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 2b73fd1e4528..3d58204c9d44 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -481,4 +481,10 @@ sys_call_table: | |||
| 481 | PTR sys_timerfd_create /* 5280 */ | 481 | PTR sys_timerfd_create /* 5280 */ |
| 482 | PTR sys_timerfd_gettime | 482 | PTR sys_timerfd_gettime |
| 483 | PTR sys_timerfd_settime | 483 | PTR sys_timerfd_settime |
| 484 | PTR sys_signalfd4 | ||
| 485 | PTR sys_eventfd2 | ||
| 486 | PTR sys_epoll_create1 /* 5285 */ | ||
| 487 | PTR sys_dup3 | ||
| 488 | PTR sys_pipe2 | ||
| 489 | PTR sys_inotify_init1 | ||
| 484 | .size sys_call_table,.-sys_call_table | 490 | .size sys_call_table,.-sys_call_table |