diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /arch/mips/kernel/scall64-o32.S | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 78d768a3e19d..049a9c8c49a0 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -543,4 +543,8 @@ sys_call_table: | |||
| 543 | PTR sys_fanotify_init | 543 | PTR sys_fanotify_init |
| 544 | PTR sys_32_fanotify_mark | 544 | PTR sys_32_fanotify_mark |
| 545 | PTR sys_prlimit64 | 545 | PTR sys_prlimit64 |
| 546 | PTR sys_name_to_handle_at | ||
| 547 | PTR compat_sys_open_by_handle_at /* 4340 */ | ||
| 548 | PTR compat_sys_clock_adjtime | ||
| 549 | PTR sys_syncfs | ||
| 546 | .size sys_call_table,.-sys_call_table | 550 | .size sys_call_table,.-sys_call_table |