Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux.git] / arch / parisc / kernel / syscall_table.S

diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index dd52c23c0dcd4bfc3661b3d4807cc121b02c602b..fc9cab1cc2df10453b584697cce9b5ee2b242a2c 100644 (file)
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -247,9 +247,6 @@
        ENTRY_SAME(sched_yield)
        ENTRY_SAME(sched_get_priority_max)
        ENTRY_SAME(sched_get_priority_min)      /* 160 */
-       /* These 2 would've worked if someone had defined struct timespec
-        * carefully, like timeval for example (which is about the same).
-        * Unfortunately it contains a long :-( */
        ENTRY_COMP(sched_rr_get_interval)
        ENTRY_COMP(nanosleep)
        ENTRY_SAME(mremap)
@@ -286,8 +283,8 @@
        ENTRY_SAME(semop)               /* 185 */
        ENTRY_SAME(semget)
        ENTRY_DIFF(semctl)
-       ENTRY_DIFF(msgsnd)
-       ENTRY_DIFF(msgrcv)
+       ENTRY_COMP(msgsnd)
+       ENTRY_COMP(msgrcv)
        ENTRY_SAME(msgget)              /* 190 */
        ENTRY_SAME(msgctl)
        ENTRY_SAME(shmat)
@@ -307,7 +304,7 @@
        ENTRY_SAME(gettid)
        ENTRY_OURS(readahead)
        ENTRY_SAME(tkill)
-       ENTRY_SAME(sendfile64)
+       ENTRY_DIFF(sendfile64)
        ENTRY_COMP(futex)               /* 210 */
        ENTRY_COMP(sched_setaffinity)
        ENTRY_COMP(sched_getaffinity)
@@ -327,12 +324,12 @@
        ENTRY_SAME(epoll_wait)
        ENTRY_SAME(remap_file_pages)
        ENTRY_SAME(semtimedop)
-       ENTRY_SAME(mq_open)
+       ENTRY_COMP(mq_open)
        ENTRY_SAME(mq_unlink)           /* 230 */
-       ENTRY_SAME(mq_timedsend)
-       ENTRY_SAME(mq_timedreceive)
-       ENTRY_SAME(mq_notify)
-       ENTRY_SAME(mq_getsetattr)
+       ENTRY_COMP(mq_timedsend)
+       ENTRY_COMP(mq_timedreceive)
+       ENTRY_COMP(mq_notify)
+       ENTRY_COMP(mq_getsetattr)
        ENTRY_COMP(waitid)              /* 235 */
        ENTRY_OURS(fadvise64_64)
        ENTRY_SAME(set_tid_address)
@@ -403,7 +400,7 @@
        ENTRY_COMP(signalfd)
        ENTRY_SAME(ni_syscall)          /* was timerfd */
        ENTRY_SAME(eventfd)
-       ENTRY_COMP(fallocate)           /* 305 */
+       ENTRY_OURS(fallocate)           /* 305 */
        ENTRY_SAME(timerfd_create)
        ENTRY_COMP(timerfd_settime)
        ENTRY_COMP(timerfd_gettime)
@@ -428,6 +425,10 @@
        ENTRY_SAME(syncfs)
        ENTRY_SAME(setns)
        ENTRY_COMP(sendmmsg)
+       ENTRY_COMP(process_vm_readv)    /* 330 */
+       ENTRY_COMP(process_vm_writev)
+       ENTRY_SAME(kcmp)
+       ENTRY_SAME(finit_module)
 
        /* Nothing yet */