Browse Source

ieee1394: raw1394: Add ioctl() for 32bit userland on 64bit kernel, amendment

Pointed out by Arnd Bergmann:  PPC32 aligns this at 64bit, IA32 packs
it.  A kernel-wide available __compat_u64 which is 4-byte aligned on
AMD64 and IA64 would be nicer though.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Stefan Richter 18 years ago
parent
commit
19f00e66f8
1 changed files with 5 additions and 1 deletions
  1. 5 1
      drivers/ieee1394/raw1394.c

+ 5 - 1
drivers/ieee1394/raw1394.c

@@ -2814,7 +2814,11 @@ struct raw1394_iso_packets32 {
 struct raw1394_cycle_timer32 {
 struct raw1394_cycle_timer32 {
         __u32 cycle_timer;
         __u32 cycle_timer;
         __u64 local_time;
         __u64 local_time;
-} __attribute__((packed));
+}
+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
+__attribute__((packed))
+#endif
+;
 
 
 #define RAW1394_IOC_ISO_RECV_PACKETS32          \
 #define RAW1394_IOC_ISO_RECV_PACKETS32          \
         _IOW ('#', 0x25, struct raw1394_iso_packets32)
         _IOW ('#', 0x25, struct raw1394_iso_packets32)