summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-27 14:54:36 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:55:18 -0500
commit84dfa9897ef913771af44484fefbe0de29fdce51 (patch)
tree83bd6cdaa765a0517586edc8e67458000b20b4f1 /arch/cris
parent93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115 (diff)
downloadop-kernel-dev-84dfa9897ef913771af44484fefbe0de29fdce51.zip
op-kernel-dev-84dfa9897ef913771af44484fefbe0de29fdce51.tar.gz
consolidate a bunch of ipcbuf.h instances
... some still remain weird :-/ Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/include/asm/ipcbuf.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/arch/cris/include/asm/ipcbuf.h b/arch/cris/include/asm/ipcbuf.h
index 8b0c18b..84c7e51 100644
--- a/arch/cris/include/asm/ipcbuf.h
+++ b/arch/cris/include/asm/ipcbuf.h
@@ -1,29 +1 @@
-#ifndef __CRIS_IPCBUF_H__
-#define __CRIS_IPCBUF_H__
-
-/*
- * The user_ipc_perm structure for CRIS 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 /* __CRIS_IPCBUF_H__ */
+#include <asm-generic/ipcbuf.h>
OpenPOWER on IntegriCloud