summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAneesh Bansal <aneesh.bansal@freescale.com>2015-12-08 13:54:28 +0530
committerYork Sun <yorksun@freescale.com>2015-12-15 08:57:34 +0800
commite8f954a756a825130d11b9c8fca70101dd8b3ac5 (patch)
treee3b45d7ada855e17b537300f3f04bf958819dac8 /include
parent70f959c3c45bd408ba4f7b18a3a69afd9ccfe739 (diff)
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 <aneesh.bansal@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/compiler.h3
-rw-r--r--include/linux/types.h1
2 files changed, 1 insertions, 3 deletions
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 <stdint.h>
-#else
-/* Type for `void *' pointers. */
-typedef unsigned long int uintptr_t;
#endif
#include <linux/string.h>
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.