From 54e4c9115894957f8ab34a530851fe9ebebc4172 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 1 Sep 2008 14:10:03 +0100 Subject: [PATCH] --- yaml --- r: 113629 b: refs/heads/master c: 4dc429243d0ced7db475d826b4606c21cc28c325 h: refs/heads/master i: 113627: 4c9d2100920b5abadb74e549cdfcbd373473edd9 v: v3 --- [refs] | 2 +- trunk/arch/ia64/include/asm/statfs.h | 52 +++------------------------- 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/[refs] b/[refs] index bf03cdb2722b..bb88069b8d71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5e48a28d04f0078dbf850159f7c068864f24bb1 +refs/heads/master: 4dc429243d0ced7db475d826b4606c21cc28c325 diff --git a/trunk/arch/ia64/include/asm/statfs.h b/trunk/arch/ia64/include/asm/statfs.h index 811097974f31..1e589669de56 100644 --- a/trunk/arch/ia64/include/asm/statfs.h +++ b/trunk/arch/ia64/include/asm/statfs.h @@ -8,55 +8,13 @@ * David Mosberger-Tang , Hewlett-Packard Co */ -#ifndef __KERNEL_STRICT_NAMES -# include -typedef __kernel_fsid_t fsid_t; -#endif - /* - * This is ugly --- we're already 64-bit, so just duplicate the definitions + * We need compat_statfs64 to be packed, because the i386 ABI won't + * add padding at the end to bring it to a multiple of 8 bytes, but + * the IA64 ABI will. */ -struct statfs { - long f_type; - long f_bsize; - long f_blocks; - long f_bfree; - long f_bavail; - long f_files; - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; - long f_spare[5]; -}; - - -struct statfs64 { - long f_type; - long f_bsize; - long f_blocks; - long f_bfree; - long f_bavail; - long f_files; - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; - long f_spare[5]; -}; +#define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4))) -struct compat_statfs64 { - __u32 f_type; - __u32 f_bsize; - __u64 f_blocks; - __u64 f_bfree; - __u64 f_bavail; - __u64 f_files; - __u64 f_ffree; - __kernel_fsid_t f_fsid; - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -} __attribute__((packed)); +#include #endif /* _ASM_IA64_STATFS_H */