diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:02:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:02:02 -0700 |
commit | 22054fbe7adbdd6db5cc766912ac41ab20b016ef (patch) | |
tree | 82aa8fdb0aca6ca721776d670404d30647c5c903 /arch/parisc/include/uapi/asm/ipcbuf.h | |
parent | ea26d0cff44420052495731af34fcab561d3953a (diff) | |
parent | 6238559f0b709c02f680f584b9a1aaa3eb660d39 (diff) | |
download | linux-3.10-22054fbe7adbdd6db5cc766912ac41ab20b016ef.tar.gz linux-3.10-22054fbe7adbdd6db5cc766912ac41ab20b016ef.tar.bz2 linux-3.10-22054fbe7adbdd6db5cc766912ac41ab20b016ef.zip |
Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull PARISC changes from James Bottomley:
"This is a couple of high code motion patches (all within arch/parisc)
I'd like to apply at -rc1 to avoid conflicts with anything else. One
moves us on to the generated instead of included asm file model and
the other is a pull request from David Howells for UAPI
disintegration.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
* tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
UAPI: (Scripted) Disintegrate arch/parisc/include/asm
[PARISC] asm: redo generic includes
Diffstat (limited to 'arch/parisc/include/uapi/asm/ipcbuf.h')
-rw-r--r-- | arch/parisc/include/uapi/asm/ipcbuf.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/parisc/include/uapi/asm/ipcbuf.h b/arch/parisc/include/uapi/asm/ipcbuf.h new file mode 100644 index 00000000000..bd956c42578 --- /dev/null +++ b/arch/parisc/include/uapi/asm/ipcbuf.h @@ -0,0 +1,27 @@ +#ifndef __PARISC_IPCBUF_H__ +#define __PARISC_IPCBUF_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. + * 'seq' has been changed from long to int so that it's the same size + * on 64-bit kernels as on 32-bit ones. + */ + +struct ipc64_perm +{ + key_t key; + uid_t uid; + gid_t gid; + uid_t cuid; + gid_t cgid; + unsigned short int __pad1; + mode_t mode; + unsigned short int __pad2; + unsigned short int seq; + unsigned int __pad3; + unsigned long long int __unused1; + unsigned long long int __unused2; +}; + +#endif /* __PARISC_IPCBUF_H__ */ |