git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
scall64-64.S
diff --git
a/arch/mips/kernel/scall64-64.S
b/arch/mips/kernel/scall64-64.S
index 939e172db9531451c8e82df36914ba7b532ab5e2..4c22d0b4825dc70bcdfb5d239dc458d60d6c185c 100644
(file)
--- a/
arch/mips/kernel/scall64-64.S
+++ b/
arch/mips/kernel/scall64-64.S
@@
-466,3
+466,5
@@
sys_call_table:
PTR sys_tee /* 5265 */
PTR sys_vmsplice
PTR sys_move_pages
PTR sys_tee /* 5265 */
PTR sys_vmsplice
PTR sys_move_pages
+ PTR sys_set_robust_list
+ PTR sys_get_robust_list