From: Aneesh Bansal Date: Tue, 8 Dec 2015 08:24:28 +0000 (+0530) Subject: include/linux: move typdef for uintptr_t X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e8f954a756a825130d11b9c8fca70101dd8b3ac5;p=u-boot.git include/linux: move typdef for uintptr_t uintptr_t which is a typdef for unsigned long is needed for creating pointers (32 or 64 bit depending on Core) from 32 bit variables storing the address. If a 32 bit variable (u32) is typecasted to a pointer (void *), compiler gives a warning in case size of pointer on the core is 64 bit. The typdef has been moved from include/compiler.h to include/linux/types.h Signed-off-by: Aneesh Bansal Reviewed-by: York Sun --- diff --git a/include/compiler.h b/include/compiler.h index 47c296e202..f853ed4787 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -115,9 +115,6 @@ typedef unsigned int uint; #ifdef CONFIG_USE_STDINT /* Provided by gcc. */ #include -#else -/* Type for `void *' pointers. */ -typedef unsigned long int uintptr_t; #endif #include diff --git a/include/linux/types.h b/include/linux/types.h index 6f75be4253..c7e8fdb9c2 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -124,6 +124,7 @@ typedef __UINT64_TYPE__ u_int64_t; typedef __INT64_TYPE__ int64_t; #endif +typedef unsigned long uintptr_t; /* * Below are truly Linux-specific types that should never collide with * any application/library that wants linux/types.h.