Merge branch 'fixes' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / ipc.h

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 30e816148df42c0dd4c7fc0f71755a2a7a448215..ca833fdc3138595ed076af4ba41003e37935e5a8 100644 (file)
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -79,6 +79,7 @@ struct ipc_kludge {
 
 #ifdef __KERNEL__
 #include <linux/spinlock.h>
+#include <linux/uidgid.h>
 
 #define IPCMNI 32768  /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
 
@@ -89,10 +90,10 @@ struct kern_ipc_perm
        int             deleted;
        int             id;
        key_t           key;
-       uid_t           uid;
-       gid_t           gid;
-       uid_t           cuid;
-       gid_t           cgid;
+       kuid_t          uid;
+       kgid_t          gid;
+       kuid_t          cuid;
+       kgid_t          cgid;
        umode_t         mode; 
        unsigned long   seq;
        void            *security;