Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7f23292d5a6525a133d7cb8f2f33df39dd069822

Authored by David Gibson
Committed by Paul Mackerras
1 parent 457e04ca5c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/asm-powerpc/ipcbuf.h
Diff comments   View file @ 7f23292
... ... @@ -27,7 +27,8 @@
27 27 __kernel_mode_t mode;
28 28 unsigned int seq;
29 29 unsigned int __pad1;
30   - __u32 __unused[4];
  30 + unsigned long long __unused1;
  31 + unsigned long long __unused2;
31 32 };
32 33  
33 34 #endif /* _ASM_POWERPC_IPCBUF_H */