From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed, 4 Jul 2007 21:13:53 +0000 (+0200)
Subject: ieee1394: raw1394: fix a 32/64-bits compat fix
X-Git-Tag: v2.6.23-rc1~1199^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59337087cb33db58aa0d4463892b4475cf66a50b;p=linux-2.6

ieee1394: raw1394: fix a 32/64-bits compat fix

I was told that only i386 aligns 64 bit integers at 4 bytes boundaries
while all other architectures (32 bit architectures with 64 bit
siblings) align it on 8 bytes boundaries.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 7b5aeb39ad..a3093b79e2 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -434,7 +434,11 @@ struct compat_raw1394_req {
 
 	__u64 sendb;
 	__u64 recvb;
-} __attribute__((packed));
+}
+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
+__attribute__((packed))
+#endif
+;
 
 static const char __user *raw1394_compat_write(const char __user *buf)
 {