projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-2.6' into for-linus
[powerpc.git]
/
arch
/
s390
/
kernel
/
syscalls.S
diff --git
a/arch/s390/kernel/syscalls.S
b/arch/s390/kernel/syscalls.S
index
e59baec
..
a4ceae3
100644
(file)
--- a/
arch/s390/kernel/syscalls.S
+++ b/
arch/s390/kernel/syscalls.S
@@
-320,3
+320,4
@@
SYSCALL(sys_tee,sys_tee,sys_tee_wrapper)
SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper)
NI_SYSCALL /* 310 sys_move_pages */
SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)
+SYSCALL(sys_epoll_pwait,sys_epoll_pwait,sys_ni_syscall)