Skip to contentSkip to conversation

Revert "include/linux: move typdef for uintptr_t"

PATCH New York Sun 3 participants 3 messages Dec 16, 2015

lore
Share & tools
lore

York Sun

author
#0 lore raw

PATCH 1/1 Revert "include/linux: move typdef for uintptr_t"

This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which causes compiling errors on 32-bit hosts.

---
Compiled on 32- and 64-bit hosts for powerpc, arm and aarch64 targets.

 include/compiler.h    |    3 +++
 include/linux/types.h |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
include/compiler.h +3 -0
index f853ed4..47c296e 100644
@@ -115,6 +115,9 @@ 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>
include/linux/types.h +0 -1
index c7e8fdb..6f75be4 100644
@@ -124,7 +124,6 @@ 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.
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 Revert "include/linux: move typdef for uintptr_t"

Quoted 46 lines

-----Original Message-----
From: York Sun [mailto:yorksun at freescale.com]
Sent: Wednesday, December 16, 2015 11:42 AM
To: U-Boot Mailing List <[email protected]>
Cc: trini at konsulko.com; Sun York-R58495 <[email protected]>; Bin Meng <[email protected]>; Bansal Aneesh-B39320 <[email protected]>; Simon Glass <[email protected]>
Subject: [PATCH] Revert "include/linux: move typdef for uintptr_t"

This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which causes compiling errors on 32-bit hosts.

---
Compiled on 32- and 64-bit hosts for powerpc, arm and aarch64 targets.

 include/compiler.h    |    3 +++
 include/linux/types.h |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
include/compiler.h +3 -0
@@ -115,6 +115,9 @@ 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>
include/linux/types.h index c7e8fdb..6f75be4 renamed from include/linux/types.h +0 -0

100644

include/linux/types.h +0 -2
@@ -124,7 +124,6 @@ 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.
--
Quoted 1 line

1.7.9.5

#2 lore raw

PATCH 1/1 Revert "include/linux: move typdef for uintptr_t"

Quoted 41 lines · Bansal Aneesh
Quoted 41 lines

-----Original Message-----
From: York Sun [mailto:yorksun at freescale.com]
Sent: Wednesday, December 16, 2015 11:42 AM
To: U-Boot Mailing List <[email protected]>
Cc: trini at konsulko.com; Sun York-R58495 <[email protected]>; Bin Meng <[email protected]>; Bansal Aneesh-B39320 <[email protected]>; Simon Glass <[email protected]>
Subject: [PATCH] Revert "include/linux: move typdef for uintptr_t"

This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which causes compiling errors on 32-bit hosts.

---
Compiled on 32- and 64-bit hosts for powerpc, arm and aarch64 targets.

 include/compiler.h    |    3 +++
 include/linux/types.h |    1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
include/compiler.h +3 -0
@@ -115,6 +115,9 @@ 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>
include/linux/types.h index c7e8fdb..6f75be4 renamed from include/linux/types.h +0 -0

100644

include/linux/types.h +0 -0
@@ -124,7 +124,6 @@ typedef		__UINT64_TYPE__	u_int64_t;
 typedef		__INT64_TYPE__		int64_t;
 #endif
 
Quoted 8 lines
Quoted 6 lines
include/linux/types.h +0 -2
-typedef unsigned long uintptr_t;
 /*
  * Below are truly Linux-specific types that should never collide with
  * any application/library that wants linux/types.h.
--

1.7.9.5

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151216/7db50632/attachment.sig>