Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-x86 / ipcbuf.h

diff --git a/include/asm-x86/ipcbuf.h b/include/asm-x86/ipcbuf.h
index eb2e448c6e28fec8433b15c9eaa415fcdeb0153c..910304fbdc8f289e7f92e37a4bd2089b540f585f 100644 (file)
--- a/include/asm-x86/ipcbuf.h
+++ b/include/asm-x86/ipcbuf.h
@@ -1,13 +1,28 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "ipcbuf_32.h"
-# else
-#  include "ipcbuf_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "ipcbuf_32.h"
-# else
-#  include "ipcbuf_64.h"
-# endif
-#endif
+#ifndef ASM_X86__IPCBUF_H
+#define ASM_X86__IPCBUF_H
+
+/*
+ * The ipc64_perm structure for x86 architecture.
+ * Note extra padding because this structure is passed back and forth
+ * between kernel and user space.
+ *
+ * Pad space is left for:
+ * - 32-bit mode_t and seq
+ * - 2 miscellaneous 32-bit values
+ */
+
+struct ipc64_perm {
+       __kernel_key_t          key;
+       __kernel_uid32_t        uid;
+       __kernel_gid32_t        gid;
+       __kernel_uid32_t        cuid;
+       __kernel_gid32_t        cgid;
+       __kernel_mode_t         mode;
+       unsigned short          __pad1;
+       unsigned short          seq;
+       unsigned short          __pad2;
+       unsigned long           __unused1;
+       unsigned long           __unused2;
+};
+
+#endif /* ASM_X86__IPCBUF_H */