Merge tag 'perf-core-for-mingo-5.1-20190307' of git://git.kernel.org/pub/scm/linux...

[linux.git] / ipc / syscall.c

diff --git a/ipc/syscall.c b/ipc/syscall.c
index 1ac06e3983c0fe41446ad81f7702d7ad0283a07d..581bdff4e7c5129692c0ccacc00ba91074218479 100644 (file)
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -17,8 +17,8 @@
 #include <linux/shm.h>
 #include <linux/uaccess.h>
 
-SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
-               unsigned long, third, void __user *, ptr, long, fifth)
+int ksys_ipc(unsigned int call, int first, unsigned long second,
+       unsigned long third, void __user * ptr, long fifth)
 {
        int version, ret;
 
@@ -47,7 +47,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
                        return -EINVAL;
                if (get_user(arg, (unsigned long __user *) ptr))
                        return -EFAULT;
-               return ksys_semctl(first, second, third, arg);
+               return ksys_old_semctl(first, second, third, arg);
        }
 
        case MSGSND:
@@ -75,7 +75,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
        case MSGGET:
                return ksys_msgget((key_t) first, second);
        case MSGCTL:
-               return ksys_msgctl(first, second,
+               return ksys_old_msgctl(first, second,
                                   (struct msqid_ds __user *)ptr);
 
        case SHMAT:
@@ -100,12 +100,18 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
        case SHMGET:
                return ksys_shmget(first, second, third);
        case SHMCTL:
-               return ksys_shmctl(first, second,
+               return ksys_old_shmctl(first, second,
                                   (struct shmid_ds __user *) ptr);
        default:
                return -ENOSYS;
        }
 }
+
+SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
+               unsigned long, third, void __user *, ptr, long, fifth)
+{
+       return ksys_ipc(call, first, second, third, ptr, fifth);
+}
 #endif
 
 #ifdef CONFIG_COMPAT
@@ -121,8 +127,8 @@ struct compat_ipc_kludge {
 };
 
 #ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
-COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
-       u32, third, compat_uptr_t, ptr, u32, fifth)
+int compat_ksys_ipc(u32 call, int first, int second,
+       u32 third, compat_uptr_t ptr, u32 fifth)
 {
        int version;
        u32 pad;
@@ -146,7 +152,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
                        return -EINVAL;
                if (get_user(pad, (u32 __user *) compat_ptr(ptr)))
                        return -EFAULT;
-               return compat_ksys_semctl(first, second, third, pad);
+               return compat_ksys_old_semctl(first, second, third, pad);
 
        case MSGSND:
                return compat_ksys_msgsnd(first, ptr, second, third);
@@ -171,7 +177,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
        case MSGGET:
                return ksys_msgget(first, second);
        case MSGCTL:
-               return compat_ksys_msgctl(first, second, compat_ptr(ptr));
+               return compat_ksys_old_msgctl(first, second, compat_ptr(ptr));
 
        case SHMAT: {
                int err;
@@ -190,10 +196,16 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
        case SHMGET:
                return ksys_shmget(first, (unsigned int)second, third);
        case SHMCTL:
-               return compat_ksys_shmctl(first, second, compat_ptr(ptr));
+               return compat_ksys_old_shmctl(first, second, compat_ptr(ptr));
        }
 
        return -ENOSYS;
 }
+
+COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
+       u32, third, compat_uptr_t, ptr, u32, fifth)
+{
+       return compat_ksys_ipc(call, first, second, third, ptr, fifth);
+}
 #endif
 #endif