Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83c86984 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: unify ipcbuf.h 



The ony difference is the size of the mode.
sparc has extra padding to compensate for this.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa8efd50

arch/sparc/include/asm/Kbuild

+0 −3
Original line number Diff line number Diff line 
# User exported sparc header files

include include/asm-generic/Kbuild.asm



header-y += ipcbuf_32.h

header-y += ipcbuf_64.h



header-y += apc.h

header-y += asi.h

header-y += display7seg.h

arch/sparc/include/asm/ipcbuf.h

+31 −7
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_IPCBUF_H

#define ___ASM_SPARC_IPCBUF_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm/ipcbuf_64.h>

#else

#include <asm/ipcbuf_32.h>

#endif

#ifndef __SPARC_IPCBUF_H

#define __SPARC_IPCBUF_H



/*

 * The ipc64_perm structure for sparc/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

 * - 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

	__kernel_mode_t	mode;

	unsigned short	__pad1;

	unsigned short	seq;

	unsigned long long __unused1;

	unsigned long long __unused2;

};



#endif /* __SPARC_IPCBUF_H */

arch/sparc/include/asm/ipcbuf_32.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#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 */

arch/sparc/include/asm/ipcbuf_64.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#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 */