path: root/include/linux/types.h
diff options
authorJan Engelhardt <>2010-01-31 22:42:52 +0100
committerJan Engelhardt <>2010-02-01 01:17:29 +0100
commit350661a6eb089f3e54e67e022db9e16ea280499f (patch)
treee6857b58f535bab42e2381f7fbb027f4cc9aa63a /include/linux/types.h
parent028ad9ec6d5c27c107c9a7a316617cbe366abb0f (diff)
includes: header updates
Update the shipped Linux kernel headers from 2.6.33-rc6, as iptables's ipt_ECN.h for example references ipt_DSCP.h, which no longer exists. Since a number of old code pieces have been removed in the kernel in that fashion, the structs for older versions are moved into the .c file, to keep header updating simple. Signed-off-by: Jan Engelhardt <>
Diffstat (limited to 'include/linux/types.h')
1 files changed, 3 insertions, 124 deletions
diff --git a/include/linux/types.h b/include/linux/types.h
index eb6a9bec..8b483c80 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,133 +1,12 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
-#include <linux/posix_types.h>
#include <asm/types.h>
-typedef __u32 __kernel_dev_t;
-typedef __kernel_fd_set fd_set;
-typedef __kernel_dev_t dev_t;
-typedef __kernel_ino_t ino_t;
-typedef __kernel_mode_t mode_t;
-typedef __kernel_nlink_t nlink_t;
-typedef __kernel_off_t off_t;
-typedef __kernel_pid_t pid_t;
-typedef __kernel_daddr_t daddr_t;
-typedef __kernel_key_t key_t;
-typedef __kernel_suseconds_t suseconds_t;
-typedef __kernel_timer_t timer_t;
-typedef __kernel_clockid_t clockid_t;
-typedef __kernel_mqd_t mqd_t;
-typedef __kernel_uid_t uid_t;
-typedef __kernel_gid_t gid_t;
-#if defined(__GNUC__)
-typedef __kernel_loff_t loff_t;
- * The following typedefs are also protected by individual ifdefs for
- * historical reasons:
- */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef __kernel_size_t size_t;
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __kernel_ssize_t ssize_t;
-#ifndef _PTRDIFF_T
-#define _PTRDIFF_T
-typedef __kernel_ptrdiff_t ptrdiff_t;
-#ifndef _TIME_T
-#define _TIME_T
-typedef __kernel_time_t time_t;
+#ifndef __ASSEMBLY__
-#ifndef _CLOCK_T
-#define _CLOCK_T
-typedef __kernel_clock_t clock_t;
-#ifndef _CADDR_T
-#define _CADDR_T
-typedef __kernel_caddr_t caddr_t;
-/* bsd */
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-/* sysv */
-typedef unsigned char unchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-typedef __u8 u_int8_t;
-typedef __s8 int8_t;
-typedef __u16 u_int16_t;
-typedef __s16 int16_t;
-typedef __u32 u_int32_t;
-typedef __s32 int32_t;
-#endif /* !(__BIT_TYPES_DEFINED__) */
-typedef __u8 uint8_t;
-typedef __u16 uint16_t;
-typedef __u32 uint32_t;
-#if defined(__GNUC__)
-typedef __u64 uint64_t;
-typedef __u64 u_int64_t;
-typedef __s64 int64_t;
-/* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 __u64 __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.
- *
- * Linux always considers sectors to be 512 bytes long independently
- * of the devices real block size.
- *
- * blkcnt_t is the type of the inode's block count.
- */
-#ifdef CONFIG_LBD
-typedef u64 sector_t;
-typedef u64 blkcnt_t;
-typedef unsigned long sector_t;
-typedef unsigned long blkcnt_t;
- * The type of an index into the pagecache. Use a #define so asm/types.h
- * can override it.
- */
-#ifndef pgoff_t
-#define pgoff_t unsigned long
+#include <linux/posix_types.h>
-#endif /* __KERNEL_STRICT_NAMES */
* Below are truly Linux-specific types that should never collide with
@@ -155,5 +34,5 @@ typedef __u64 __bitwise __be64;
typedef __u16 __bitwise __sum16;
typedef __u32 __bitwise __wsum;
+#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */