From: David Gibson <david@gibson.dropbear.id.au>
Date: Wed, 2 Nov 2005 00:44:26 +0000 (+1100)
Subject: [PATCH] powerpc: Fix merged ipcbuf.h
X-Git-Tag: v2.6.15-rc1~726^2~3^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=847aeb6bad0876ff9c250725e905a41c6050157c;p=linux-2.6

[PATCH] powerpc: Fix merged ipcbuf.h

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

diff --git a/include/asm-powerpc/ipcbuf.h b/include/asm-powerpc/ipcbuf.h
index dc0f4d16d0..71382c1ec6 100644
--- a/include/asm-powerpc/ipcbuf.h
+++ b/include/asm-powerpc/ipcbuf.h
@@ -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 */