diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 13:45:22 +0200 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /arch/mips/kernel/scall64-64.S | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
| download | op-kernel-dev-4e83998f5af010a928495988c586ea2926624db9.zip op-kernel-dev-4e83998f5af010a928495988c586ea2926624db9.tar.gz | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index a8a6c59..5573f8e 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S @@ -416,9 +416,12 @@ sys_call_table: PTR sys_pipe2 PTR sys_inotify_init1 PTR sys_preadv - PTR sys_pwritev /* 5390 */ + PTR sys_pwritev /* 5290 */ PTR sys_rt_tgsigqueueinfo PTR sys_perf_event_open PTR sys_accept4 - PTR sys_recvmmsg + PTR sys_recvmmsg + PTR sys_fanotify_init /* 5295 */ + PTR sys_fanotify_mark + PTR sys_prlimit64 .size sys_call_table,.-sys_call_table |
