projects
/
powerpc.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/dtor/input
[powerpc.git]
/
arch
/
ia64
/
kernel
/
entry.S
diff --git
a/arch/ia64/kernel/entry.S
b/arch/ia64/kernel/entry.S
index
750e8e7
..
32c999f
100644
(file)
--- a/
arch/ia64/kernel/entry.S
+++ b/
arch/ia64/kernel/entry.S
@@
-1584,7
+1584,7
@@
sys_call_table:
data8 sys_keyctl
data8 sys_ioprio_set
data8 sys_ioprio_get // 1275
data8 sys_keyctl
data8 sys_ioprio_set
data8 sys_ioprio_get // 1275
- data8 sys_
ni_syscall
+ data8 sys_
move_pages
data8 sys_inotify_init
data8 sys_inotify_add_watch
data8 sys_inotify_rm_watch
data8 sys_inotify_init
data8 sys_inotify_add_watch
data8 sys_inotify_rm_watch
@@
-1606,5
+1606,10
@@
sys_call_table:
data8 sys_ni_syscall // 1295 reserved for ppoll
data8 sys_unshare
data8 sys_splice
data8 sys_ni_syscall // 1295 reserved for ppoll
data8 sys_unshare
data8 sys_splice
+ data8 sys_set_robust_list
+ data8 sys_get_robust_list
+ data8 sys_sync_file_range // 1300
+ data8 sys_tee
+ data8 sys_vmsplice
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls