aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2005-11-03 10:13:58 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-03 16:58:17 +1100
commit7f23292d5a6525a133d7cb8f2f33df39dd069822 (patch)
treeee2490650a26674dab6172e3f20093b0fb753d46
parent457e04ca5cb6efa9392c48409bee802eaa394d8c (diff)
[PATCH] powerpc: Keep fixing merged ipcbuf.h
Oops, replacing the two u64s in struct ipc64_perm with __u32s changed the alignment of that structure, which could mess up userspace. Revert to using two unsigned long longs (which is what ppc32 had originally). ppc64 orignally had two unsigned longs, but long long is the same size on 64 bit, so this should be ok there too. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--include/asm-powerpc/ipcbuf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h
index 71382c1ec6e..2c3e1d94db1 100644
--- a/include/asm-powerpc/ipcbuf.h
+++ b/include/asm-powerpc/ipcbuf.h
@@ -27,7 +27,8 @@ struct ipc64_perm
__kernel_mode_t mode;
unsigned int seq;
unsigned int __pad1;
- __u32 __unused[4];
+ unsigned long long __unused1;
+ unsigned long long __unused2;
};
#endif /* _ASM_POWERPC_IPCBUF_H */