aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2005-11-02 11:44:26 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-02 14:48:05 +1100
commit847aeb6bad0876ff9c250725e905a41c6050157c (patch)
tree5b7cca7a4a6c1c43f3a8399d54a5ef6a4be6b130 /include
parenta39dbcf71eba6e00ac6ae5482f499f9b57f1075e (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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h
index dc0f4d16d05..71382c1ec6e 100644
--- a/include/asm-powerpc/ipcbuf.h
+++ b/include/asm-powerpc/ipcbuf.h
@@ -27,8 +27,7 @@ struct ipc64_perm
__kernel_mode_t mode;
unsigned int seq;
unsigned int __pad1;
- u64 __unused1;
- u64 __unused2;
+ __u32 __unused[4];
};
#endif /* _ASM_POWERPC_IPCBUF_H */