Skip to content

Commit

Permalink
[PATCH] powerpc: Merge ipcbuf.h
Browse files Browse the repository at this point in the history
This patch merges ppc32 and ppc64 versions of ipcbuf.h.  The merge is
essentially trivial, since the structure defined in each version was
already identical.  Only wrinkle is that the merged version now
includes linux/types.h in order to get the fixed width integer types.
In fact, the old versions probably should have been including that
anyway, since the file uses various __kernel_*_t types.

Built and booted on G5, built for 32-bit pmac, but not booted, since
the merge tree currently doesn't boot there.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
David Gibson authored and Paul Mackerras committed Nov 1, 2005
1 parent 811d417 commit 031ef0a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 57 deletions.
34 changes: 34 additions & 0 deletions include/asm-powerpc/ipcbuf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#ifndef _ASM_POWERPC_IPCBUF_H
#define _ASM_POWERPC_IPCBUF_H

/*
* The ipc64_perm structure for the powerpc is identical to
* kern_ipc_perm as we have always had 32-bit UIDs and GIDs in the
* kernel. Note extra padding because this structure is passed back
* and forth between kernel and user space. Pad space is left for:
* - 1 32-bit value to fill up for 8-byte alignment
* - 2 miscellaneous 64-bit values
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/

#include <linux/types.h>

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 int seq;
unsigned int __pad1;
u64 __unused1;
u64 __unused2;
};

#endif /* _ASM_POWERPC_IPCBUF_H */
29 changes: 0 additions & 29 deletions include/asm-ppc/ipcbuf.h

This file was deleted.

28 changes: 0 additions & 28 deletions include/asm-ppc64/ipcbuf.h

This file was deleted.

0 comments on commit 031ef0a

Please sign in to comment.