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 branch 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
syscall_table.S
diff --git
a/arch/parisc/kernel/syscall_table.S
b/arch/parisc/kernel/syscall_table.S
index c5fa7a697fba2a13b0779e59904ec7c1428e8ef4..84c5d3a58fa189b91e8671c29879d27238ccb160 100644
(file)
--- a/
arch/parisc/kernel/syscall_table.S
+++ b/
arch/parisc/kernel/syscall_table.S
@@
-418,7
+418,7
@@
ENTRY_SAME(accept4) /* 320 */
ENTRY_SAME(prlimit64)
ENTRY_SAME(fanotify_init)
- ENTRY_
COMP
(fanotify_mark)
+ ENTRY_
DIFF
(fanotify_mark)
ENTRY_COMP(clock_adjtime)
ENTRY_SAME(name_to_handle_at) /* 325 */
ENTRY_COMP(open_by_handle_at)