From 03b6b059c5fdf2c25785ea3c85faa512ae8ecbac Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 23 Oct 2007 22:37:24 +0200 Subject: [PATCH] --- yaml --- r: 72375 b: refs/heads/master c: d5f1354183573af3f908c71c5323ae800dd1e591 h: refs/heads/master i: 72373: f73d4327d3a35491200b63fbbc1f029ff3e29009 72371: 96d9196e8cc426b778918b9d2cd5150ed3b9a5b9 72367: 0df5f4807463bc6abd96226bdbc97c177dfd2ff7 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/Kbuild | 2 - trunk/include/asm-x86/statfs.h | 72 ++++++++++++++++++++++++++----- trunk/include/asm-x86/statfs_32.h | 6 --- trunk/include/asm-x86/statfs_64.h | 58 ------------------------- 5 files changed, 62 insertions(+), 78 deletions(-) delete mode 100644 trunk/include/asm-x86/statfs_32.h delete mode 100644 trunk/include/asm-x86/statfs_64.h diff --git a/[refs] b/[refs] index 2b73e8123077..f3f0695efcf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79c74977045a3f1f5eeb45241198fa3d6970c85f +refs/heads/master: d5f1354183573af3f908c71c5323ae800dd1e591 diff --git a/trunk/include/asm-x86/Kbuild b/trunk/include/asm-x86/Kbuild index af183e8c5fd6..6e3ef075d582 100644 --- a/trunk/include/asm-x86/Kbuild +++ b/trunk/include/asm-x86/Kbuild @@ -31,8 +31,6 @@ unifdef-y += sigcontext_32.h unifdef-y += sigcontext_64.h unifdef-y += signal_32.h unifdef-y += signal_64.h -unifdef-y += statfs_32.h -unifdef-y += statfs_64.h unifdef-y += unistd_32.h unifdef-y += unistd_64.h unifdef-y += user_32.h diff --git a/trunk/include/asm-x86/statfs.h b/trunk/include/asm-x86/statfs.h index 327fb5d7a148..7c651aa97252 100644 --- a/trunk/include/asm-x86/statfs.h +++ b/trunk/include/asm-x86/statfs.h @@ -1,13 +1,63 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "statfs_32.h" -# else -# include "statfs_64.h" -# endif +#ifndef _ASM_X86_STATFS_H +#define _ASM_X86_STATFS_H + +#ifdef __i386__ +#include #else -# ifdef __i386__ -# include "statfs_32.h" -# else -# include "statfs_64.h" -# endif + +#ifndef __KERNEL_STRICT_NAMES + +#include + +typedef __kernel_fsid_t fsid_t; + +#endif + +/* + * This is ugly -- we're already 64-bit clean, so just duplicate the + * definitions. + */ +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]; +}; + +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)); + +#endif /* !__i386__ */ #endif diff --git a/trunk/include/asm-x86/statfs_32.h b/trunk/include/asm-x86/statfs_32.h deleted file mode 100644 index 24972c175132..000000000000 --- a/trunk/include/asm-x86/statfs_32.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _I386_STATFS_H -#define _I386_STATFS_H - -#include - -#endif diff --git a/trunk/include/asm-x86/statfs_64.h b/trunk/include/asm-x86/statfs_64.h deleted file mode 100644 index b3f4718af30b..000000000000 --- a/trunk/include/asm-x86/statfs_64.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef _X86_64_STATFS_H -#define _X86_64_STATFS_H - -#ifndef __KERNEL_STRICT_NAMES - -#include - -typedef __kernel_fsid_t fsid_t; - -#endif - -/* - * This is ugly -- we're already 64-bit clean, so just duplicate the - * definitions. - */ -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]; -}; - -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)); - -#endif