]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] powerpc: Fix merged ipcbuf.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Wed, 2 Nov 2005 00:44:26 +0000 (11:44 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 03:48:05 +0000 (14:48 +1100)
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>
include/asm-powerpc/ipcbuf.h

index dc0f4d16d05ea240f58524a923a38b8a6893072d..71382c1ec6e3fb6d200c3b06985a2ed65a64c63a 100644 (file)
@@ -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 */