summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-07-04 23:13:53 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-07-10 00:07:39 +0200
commit59337087cb33db58aa0d4463892b4475cf66a50b (patch)
tree10fe5d789fd08fab0b23e0b152397afed89862d3 /drivers/ieee1394
parentieee1394: raw1394: Add ioctl() for 32bit userland on 64bit kernel, amendment (diff)
downloadlinux-59337087cb33db58aa0d4463892b4475cf66a50b.tar.xz
linux-59337087cb33db58aa0d4463892b4475cf66a50b.zip
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>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/raw1394.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 7b5aeb39ad85..a3093b79e284 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)
{