diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-11-01 19:44:26 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 22:48:05 -0500 |
| commit | 847aeb6bad0876ff9c250725e905a41c6050157c (patch) | |
| tree | 5b7cca7a4a6c1c43f3a8399d54a5ef6a4be6b130 /include | |
| parent | a39dbcf71eba6e00ac6ae5482f499f9b57f1075e (diff) | |
[PATCH] powerpc: Fix merged ipcbuf.h
Oops, when merging ipcbuf.h, I forgot that 'u64' can't be used in
user-visible headers. This patch corrects the problem, replacing the
unused fields with an array of four __u32s.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/ipcbuf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h index dc0f4d16d05e..71382c1ec6e3 100644 --- a/include/asm-powerpc/ipcbuf.h +++ b/include/asm-powerpc/ipcbuf.h | |||
| @@ -27,8 +27,7 @@ struct ipc64_perm | |||
| 27 | __kernel_mode_t mode; | 27 | __kernel_mode_t mode; |
| 28 | unsigned int seq; | 28 | unsigned int seq; |
| 29 | unsigned int __pad1; | 29 | unsigned int __pad1; |
| 30 | u64 __unused1; | 30 | __u32 __unused[4]; |
| 31 | u64 __unused2; | ||
| 32 | }; | 31 | }; |
| 33 | 32 | ||
| 34 | #endif /* _ASM_POWERPC_IPCBUF_H */ | 33 | #endif /* _ASM_POWERPC_IPCBUF_H */ |