X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flinux%2Ftypes.h;h=51cb284bb8834510f2ad5d8b53ba19c74fcd1c4a;hb=bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e;hp=1b0b4a44c456a6d20303cf6de31293a7840911f6;hpb=49a4c7476f5f7c67dc8159537d9fbcdcfa91afb8;p=oweals%2Fu-boot.git diff --git a/include/linux/types.h b/include/linux/types.h index 1b0b4a44c4..51cb284bb8 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -1,12 +1,9 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H -#ifdef __KERNEL__ -#include -#endif - #include #include +#include #ifndef __KERNEL_STRICT_NAMES @@ -27,6 +24,8 @@ typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; typedef __kernel_gid16_t gid16_t; +typedef unsigned long uintptr_t; + #ifdef CONFIG_UID16 /* This is defined by include/asm-{arch}/posix_types.h */ typedef __kernel_old_uid_t old_uid_t; @@ -115,6 +114,15 @@ typedef __s64 int64_t; #endif /* __KERNEL_STRICT_NAMES */ +/* this is a special 64bit data type that is 8-byte aligned */ +#define aligned_u64 __u64 __aligned(8) +#define aligned_be64 __be64 __aligned(8) +#define aligned_le64 __le64 __aligned(8) + +#ifdef __KERNEL__ +typedef phys_addr_t resource_size_t; +#endif + /* * Below are truly Linux-specific types that should never collide with * any application/library that wants linux/types.h. @@ -141,14 +149,18 @@ typedef __u64 __bitwise __be64; typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; - typedef unsigned __bitwise__ gfp_t; +#ifdef __linux__ struct ustat { __kernel_daddr_t f_tfree; __kernel_ino_t f_tinode; char f_fname[6]; char f_fpack[6]; }; +#endif + +#define DECLARE_BITMAP(name, bits) \ + unsigned long name[BITS_TO_LONGS(bits)] #endif /* _LINUX_TYPES_H */