Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: merge statfs_32/64.h

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2007-10-23 22:37:24 +02:00
parent 79c7497704
commit d5f1354183
4 changed files with 61 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-x86/Kbuild
View File

@ -31,8 +31,6 @@ unifdef-y += sigcontext_32.h
unifdef-y += sigcontext_64.h unifdef-y += sigcontext_64.h
unifdef-y += signal_32.h unifdef-y += signal_32.h
unifdef-y += signal_64.h unifdef-y += signal_64.h
unifdef-y += statfs_32.h
unifdef-y += statfs_64.h
unifdef-y += unistd_32.h unifdef-y += unistd_32.h
unifdef-y += unistd_64.h unifdef-y += unistd_64.h
unifdef-y += user_32.h unifdef-y += user_32.h

72
include/asm-x86/statfs.h
View File

@ -1,13 +1,63 @@
#ifdef __KERNEL__ #ifndef _ASM_X86_STATFS_H
# ifdef CONFIG_X86_32 #define _ASM_X86_STATFS_H
# include "statfs_32.h"
# else #ifdef __i386__
# include "statfs_64.h" #include <asm-generic/statfs.h>
# endif
#else #else
# ifdef __i386__
# include "statfs_32.h" #ifndef __KERNEL_STRICT_NAMES
# else
# include "statfs_64.h" #include <linux/types.h>
# endif
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 #endif

6
include/asm-x86/statfs_32.h
View File

@ -1,6 +0,0 @@
#ifndef _I386_STATFS_H
#define _I386_STATFS_H
#include <asm-generic/statfs.h>
#endif

58
include/asm-x86/statfs_64.h
View File

@ -1,58 +0,0 @@
#ifndef _X86_64_STATFS_H
#define _X86_64_STATFS_H
#ifndef __KERNEL_STRICT_NAMES
#include <linux/types.h>
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