diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2013-07-03 13:03:46 +0900 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-07-03 13:13:29 -0700 |
commit | 46b3bc7cefcae9cb707791dbdab890697c07fa02 (patch) | |
tree | 6a5484c599787664c528fb66a6b87a55f32d6d53 /original | |
parent | 0858686f5716a44df838be79b81adf8190e54113 (diff) | |
download | kernel-headers-46b3bc7cefcae9cb707791dbdab890697c07fa02.tar.gz |
Update linux/types.h to linux 2.6.20.
The current version appears to be identical to the one in
2.6.18. This provides the __sum16 typedef which is needed to
allow linux/icmpv6.h to compile.
Bug: 9469682
Change-Id: I984154487c38f6fa827bd78234f7fc2e4e1c383f
Diffstat (limited to 'original')
-rw-r--r-- | original/linux/types.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/original/linux/types.h b/original/linux/types.h index 3f23566..0351bf2 100644 --- a/original/linux/types.h +++ b/original/linux/types.h @@ -33,6 +33,8 @@ typedef __kernel_clockid_t clockid_t; typedef __kernel_mqd_t mqd_t; #ifdef __KERNEL__ +typedef _Bool bool; + typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -126,17 +128,27 @@ typedef __s64 int64_t; /* this is a special 64bit data type that is 8-byte aligned */ #define aligned_u64 unsigned long long __attribute__((aligned(8))) +#define aligned_be64 __be64 __attribute__((aligned(8))) +#define aligned_le64 __le64 __attribute__((aligned(8))) -/* +/** * The type used for indexing onto a disc or disc partition. - * If required, asm/types.h can override it and define - * HAVE_SECTOR_T + * + * Linux always considers sectors to be 512 bytes long independently + * of the devices real block size. */ -#ifndef HAVE_SECTOR_T +#ifdef CONFIG_LBD +typedef u64 sector_t; +#else typedef unsigned long sector_t; #endif -#ifndef HAVE_BLKCNT_T +/* + * The type of the inode's block count. + */ +#ifdef CONFIG_LSF +typedef u64 blkcnt_t; +#else typedef unsigned long blkcnt_t; #endif @@ -174,6 +186,8 @@ typedef __u32 __bitwise __be32; typedef __u64 __bitwise __le64; typedef __u64 __bitwise __be64; #endif +typedef __u16 __bitwise __sum16; +typedef __u32 __bitwise __wsum; #ifdef __KERNEL__ typedef unsigned __bitwise__ gfp_t; |