[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: NDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

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 */