diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 23:07:36 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-03-23 23:07:36 +0800 |
| commit | 126601dd3f5303b50033dcb88945d928aa764aa4 (patch) | |
| tree | 36f80c2aaa18e794fc65cd4a756a28146bd50b5e /libc/kernel/arch-x86/asm/statfs.h | |
| parent | eaae81082cb76efa43a2c3fb57997b28ca270634 (diff) | |
| download | bionic-126601dd3f5303b50033dcb88945d928aa764aa4.zip bionic-126601dd3f5303b50033dcb88945d928aa764aa4.tar.gz bionic-126601dd3f5303b50033dcb88945d928aa764aa4.tar.bz2 | |
Fixed to #include correct 32-bit headers; Refreshed libc/kernel headers
This patch fixes an issue where 64-bit hreaders are incorrectly included
in kernel headers. For example, file "libc/kernel/arch-x86/asm/io.h"
incorreclty includes "io_64.h" (missing, BTW) instead of "io_32.h".
The reason is because CONFIG_X86_32 isn't considered pre-defined in
"kernel_default_arch_macros" for x86, and clean_header.py doesn't
look at it at all anyway (ie. __i386__ is also ignored, but it's
okay since x86 cross compiler defines it back)
Fixed 2 tools/*py, README.TXT, and refreshed libc/kernel headers
Change-Id: Iac834cc8b3548f055d3f2a214af36072dd679fe8
Diffstat (limited to 'libc/kernel/arch-x86/asm/statfs.h')
| -rw-r--r-- | libc/kernel/arch-x86/asm/statfs.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/libc/kernel/arch-x86/asm/statfs.h b/libc/kernel/arch-x86/asm/statfs.h index f137d17..7472605 100644 --- a/libc/kernel/arch-x86/asm/statfs.h +++ b/libc/kernel/arch-x86/asm/statfs.h @@ -18,58 +18,6 @@ ****************************************************************************/ #ifndef _ASM_X86_STATFS_H #define _ASM_X86_STATFS_H -#ifdef __i386__ #include <asm-generic/statfs.h> -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#else -struct statfs { - long f_type; - long f_bsize; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_blocks; - long f_bfree; - long f_bavail; - long f_files; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; - long f_frsize; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_spare[5]; -}; -struct statfs64 { - long f_type; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_bsize; - long f_blocks; - long f_bfree; - long f_bavail; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_files; - long f_ffree; - __kernel_fsid_t f_fsid; - long f_namelen; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - long f_frsize; - long f_spare[5]; -}; -struct compat_statfs64 { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - __u32 f_type; - __u32 f_bsize; - __u64 f_blocks; - __u64 f_bfree; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - __u64 f_bavail; - __u64 f_files; - __u64 f_ffree; - __kernel_fsid_t f_fsid; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - __u32 f_namelen; - __u32 f_frsize; - __u32 f_spare[5]; -} __attribute__((packed)); -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#endif #endif +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |