powerpc: Merge ipcbuf.h

[Andreas Schwab]

David Gibson <david at gibson.dropbear.id.au> writes:

> 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 at au1.ibm.com>
>
> Index: working-2.6/include/asm-powerpc/ipcbuf.h
> ===================================================================
> --- working-2.6.orig/include/asm-powerpc/ipcbuf.h	2005-11-02 10:41:06.000000000 +1100
> +++ working-2.6/include/asm-powerpc/ipcbuf.h	2005-11-02 11:41:36.000000000 +1100
> @@ -27,8 +27,7 @@
>  	__kernel_mode_t	mode;
>  	unsigned int	seq;
>  	unsigned int	__pad1;
> -	u64		__unused1;
> -	u64		__unused2;
> +	__u32		__unused[4];

I think you are changing the alignment of the structure.  A u64 has bigger
alignment than a u32[2].

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab at suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."