diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 01:59:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 01:59:05 +0200 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /arch/blackfin/include/asm/ipcbuf.h | |
| parent | netns bridge: cleanup bridges during netns stop (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinn... (diff) | |
| download | linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.tar.xz linux-17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'arch/blackfin/include/asm/ipcbuf.h')
| -rw-r--r-- | arch/blackfin/include/asm/ipcbuf.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h new file mode 100644 index 000000000000..8f0899cdf4d2 --- /dev/null +++ b/arch/blackfin/include/asm/ipcbuf.h @@ -0,0 +1,30 @@ +/* Changes origined from m68k version. Lineo Inc. May 2001 */ + +#ifndef __BFIN_IPCBUF_H__ +#define __BFIN_IPCBUF_H__ + +/* + * The user_ipc_perm structure for m68k 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 /* __BFIN_IPCBUF_H__ */ |