sparc: unify ipcbuf.h
The ony difference is the size of the mode. sparc has extra padding to compensate for this. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fa8efd50b3
commit
83c86984bf
|
@ -1,9 +1,6 @@
|
||||||
# User exported sparc header files
|
# User exported sparc header files
|
||||||
include include/asm-generic/Kbuild.asm
|
include include/asm-generic/Kbuild.asm
|
||||||
|
|
||||||
header-y += ipcbuf_32.h
|
|
||||||
header-y += ipcbuf_64.h
|
|
||||||
|
|
||||||
header-y += apc.h
|
header-y += apc.h
|
||||||
header-y += asi.h
|
header-y += asi.h
|
||||||
header-y += display7seg.h
|
header-y += display7seg.h
|
||||||
|
|
|
@ -1,8 +1,32 @@
|
||||||
#ifndef ___ASM_SPARC_IPCBUF_H
|
#ifndef __SPARC_IPCBUF_H
|
||||||
#define ___ASM_SPARC_IPCBUF_H
|
#define __SPARC_IPCBUF_H
|
||||||
#if defined(__sparc__) && defined(__arch64__)
|
|
||||||
#include <asm/ipcbuf_64.h>
|
/*
|
||||||
#else
|
* The ipc64_perm structure for sparc/sparc64 architecture.
|
||||||
#include <asm/ipcbuf_32.h>
|
* Note extra padding because this structure is passed back and forth
|
||||||
#endif
|
* between kernel and user space.
|
||||||
|
*
|
||||||
|
* Pad space is left for:
|
||||||
|
* - 32-bit seq
|
||||||
|
* - on sparc for 32 bit mode (it is 32 bit on sparc64)
|
||||||
|
* - 2 miscellaneous 64-bit values
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct ipc64_perm
|
||||||
|
{
|
||||||
|
__kernel_key_t key;
|
||||||
|
__kernel_uid_t uid;
|
||||||
|
__kernel_gid_t gid;
|
||||||
|
__kernel_uid_t cuid;
|
||||||
|
__kernel_gid_t cgid;
|
||||||
|
#ifndef __arch64__
|
||||||
|
unsigned short __pad0;
|
||||||
#endif
|
#endif
|
||||||
|
__kernel_mode_t mode;
|
||||||
|
unsigned short __pad1;
|
||||||
|
unsigned short seq;
|
||||||
|
unsigned long long __unused1;
|
||||||
|
unsigned long long __unused2;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* __SPARC_IPCBUF_H */
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
#ifndef _SPARC_IPCBUF_H
|
|
||||||
#define _SPARC_IPCBUF_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The ipc64_perm structure for sparc 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
|
|
||||||
* - 32-bit seq
|
|
||||||
* - 2 miscellaneous 64-bit values (so that this structure matches
|
|
||||||
* sparc64 ipc64_perm)
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct ipc64_perm
|
|
||||||
{
|
|
||||||
__kernel_key_t key;
|
|
||||||
__kernel_uid32_t uid;
|
|
||||||
__kernel_gid32_t gid;
|
|
||||||
__kernel_uid32_t cuid;
|
|
||||||
__kernel_gid32_t cgid;
|
|
||||||
unsigned short __pad1;
|
|
||||||
__kernel_mode_t mode;
|
|
||||||
unsigned short __pad2;
|
|
||||||
unsigned short seq;
|
|
||||||
unsigned long long __unused1;
|
|
||||||
unsigned long long __unused2;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* _SPARC_IPCBUF_H */
|
|
|
@ -1,28 +0,0 @@
|
||||||
#ifndef _SPARC64_IPCBUF_H
|
|
||||||
#define _SPARC64_IPCBUF_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The ipc64_perm structure for sparc64 architecture.
|
|
||||||
* Note extra padding because this structure is passed back and forth
|
|
||||||
* between kernel and user space.
|
|
||||||
*
|
|
||||||
* Pad space is left for:
|
|
||||||
* - 32-bit seq
|
|
||||||
* - 2 miscellaneous 64-bit values
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct ipc64_perm
|
|
||||||
{
|
|
||||||
__kernel_key_t key;
|
|
||||||
__kernel_uid_t uid;
|
|
||||||
__kernel_gid_t gid;
|
|
||||||
__kernel_uid_t cuid;
|
|
||||||
__kernel_gid_t cgid;
|
|
||||||
__kernel_mode_t mode;
|
|
||||||
unsigned short __pad1;
|
|
||||||
unsigned short seq;
|
|
||||||
unsigned long __unused1;
|
|
||||||
unsigned long __unused2;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* _SPARC64_IPCBUF_H */
|
|
Loading…
Reference in New Issue