From 95ebc253e6d4a3370e3dab14743bfc99fcd9cf1b Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 28 Jun 2016 10:48:40 +0900 Subject: [PATCH] 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 in the first place, but this is already messy in U-Boot...) Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass --- arch/arm/include/asm/types.h | 1 - include/linux/types.h | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index d108915ff5..9af7353f08 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 6f75be4253..416fa66284 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. -- 2.25.1