summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-28 10:48:40 +0900
committerTom Rini <trini@konsulko.com>2016-07-14 18:22:24 -0400
commit95ebc253e6d4a3370e3dab14743bfc99fcd9cf1b (patch)
tree83315da1cb5ac35ae0249a9cacfbed31d2902020
parent8662bea38e2779a45275a6ac13a378f9f989930a (diff)
downloadu-boot-imx-95ebc253e6d4a3370e3dab14743bfc99fcd9cf1b.zip
u-boot-imx-95ebc253e6d4a3370e3dab14743bfc99fcd9cf1b.tar.gz
u-boot-imx-95ebc253e6d4a3370e3dab14743bfc99fcd9cf1b.tar.bz2
types.h: move and redefine resource_size_t
Currently, this is only defined in arch/arm/include/asm/types.h, so move it to include/linux/types.h to make it available for all architectures. I defined it with phys_addr_t as Linux does. I needed to surround the define with #ifdef __KERNEL__ ... #endif to avoid build errors in tools building. (Host tools should not include <linux/types.h> in the first place, but this is already messy in U-Boot...) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/include/asm/types.h1
-rw-r--r--include/linux/types.h4
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
index d108915..9af7353 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/asm/types.h
@@ -71,5 +71,4 @@ typedef u32 dma_addr_t;
#endif /* __KERNEL__ */
-typedef unsigned long resource_size_t;
#endif
diff --git a/include/linux/types.h b/include/linux/types.h
index 6f75be4..416fa66 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -124,6 +124,10 @@ typedef __UINT64_TYPE__ u_int64_t;
typedef __INT64_TYPE__ int64_t;
#endif
+#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.