projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
parisc
/
kernel
/
syscall_table.S
diff --git
a/arch/parisc/kernel/syscall_table.S
b/arch/parisc/kernel/syscall_table.S
index 0c9107285e668767a429056001658a25606f4783..10a0c2aad8cfd1e36dc2f75ffcf7ab841a094b86 100644
(file)
--- a/
arch/parisc/kernel/syscall_table.S
+++ b/
arch/parisc/kernel/syscall_table.S
@@
-392,7
+392,7
@@
ENTRY_COMP(vmsplice)
ENTRY_COMP(move_pages) /* 295 */
ENTRY_SAME(getcpu)
- ENTRY_
SAME
(epoll_pwait)
+ ENTRY_
COMP
(epoll_pwait)
ENTRY_COMP(statfs64)
ENTRY_COMP(fstatfs64)
ENTRY_COMP(kexec_load) /* 300 */