luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] powerpc: Merge ipcbuf.h

Browse Source 
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>
This commit is contained in:
David Gibson 2005-11-01 16:53:24 +11:00 committed by Paul Mackerras
parent 811d4176f4
commit 031ef0a72a
3 changed files with 34 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/asm-powerpc/ipcbuf.h Normal file
View File

@ -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
include/asm-ppc/ipcbuf.h
View File

@ -1,29 +0,0 @@
#ifndef __PPC_IPCBUF_H__
#define __PPC_IPCBUF_H__
/*
* The ipc64_perm structure for PPC architecture.
* 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 (so that this structure matches
* PPC64 ipc64_perm)
*/
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 long seq;
unsigned int __pad2;
unsigned long long __unused1;
unsigned long long __unused2;
};
#endif /* __PPC_IPCBUF_H__ */

28
include/asm-ppc64/ipcbuf.h
View File

@ -1,28 +0,0 @@
#ifndef __PPC64_IPCBUF_H__
#define __PPC64_IPCBUF_H__
/*
* The ipc64_perm structure for the PPC is identical to kern_ipc_perm
* as we have always had 32-bit UIDs and GIDs in the kernel.
*
* 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.
*/
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;
unsigned long __unused1;
unsigned long __unused2;
};
#endif /* __PPC64_IPCBUF_H__ */