Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index c9a8d9a8c2cc8befa9fa37b75f9615999928decb..51cb284bb8834510f2ad5d8b53ba19c74fcd1c4a 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -24,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;
@@ -104,8 +106,7 @@ typedef             __u8            uint8_t;
 typedef                __u16           uint16_t;
 typedef                __u32           uint32_t;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
-       (!defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__))
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 typedef                __u64           uint64_t;
 typedef                __u64           u_int64_t;
 typedef                __s64           int64_t;
@@ -113,10 +114,13 @@ typedef           __s64           int64_t;
 
 #endif /* __KERNEL_STRICT_NAMES */
 
-#if defined(CONFIG_USE_STDINT) && defined(__INT64_TYPE__)
-typedef                __UINT64_TYPE__ uint64_t;
-typedef                __UINT64_TYPE__ u_int64_t;
-typedef                __INT64_TYPE__          int64_t;
+/* 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
 
 /*
@@ -145,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 */