These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / parisc / include / uapi / asm / ipcbuf.h

diff --git a/kernel/arch/parisc/include/uapi/asm/ipcbuf.h b/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
index bd956c4..790c411 100644 (file)
--- a/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
@@ -1,6 +1,9 @@
 #ifndef __PARISC_IPCBUF_H__
 #define __PARISC_IPCBUF_H__
 
+#include <asm/bitsperlong.h>
+#include <linux/posix_types.h>
+
 /*
  * The ipc64_perm structure for PA-RISC is almost identical to
  * kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the kernel.
@@ -10,16 +13,18 @@
 
 struct ipc64_perm
 {
-       key_t           key;
-       uid_t           uid;
-       gid_t           gid;
-       uid_t           cuid;
-       gid_t           cgid;
+       __kernel_key_t          key;
+       __kernel_uid_t          uid;
+       __kernel_gid_t          gid;
+       __kernel_uid_t          cuid;
+       __kernel_gid_t          cgid;
+#if __BITS_PER_LONG != 64
        unsigned short int      __pad1;
-       mode_t          mode;
+#endif
+       __kernel_mode_t         mode;
        unsigned short int      __pad2;
        unsigned short int      seq;
-       unsigned int    __pad3;
+       unsigned int            __pad3;
        unsigned long long int __unused1;
        unsigned long long int __unused2;
 };