[U-Boot] [PATCH] Revert "include/linux: move typdef for uintptr_t"

[Tom Rini]

On Wed, Dec 16, 2015 at 07:00:23AM +0000, Bansal Aneesh wrote:

> > -----Original Message-----
> > From: York Sun [mailto:yorksun at freescale.com]
> > Sent: Wednesday, December 16, 2015 11:42 AM
> > To: U-Boot Mailing List <u-boot at lists.denx.de>
> > Cc: trini at konsulko.com; Sun York-R58495 <yorksun at freescale.com>; Bin Meng
> > <bmeng.cn at gmail.com>; Bansal Aneesh-B39320 <aneesh.bansal at freescale.com>;
> > Simon Glass <sjg at chromium.org>
> > Subject: [PATCH] Revert "include/linux: move typdef for uintptr_t"
> > 
> > This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which causes
> > compiling errors on 32-bit hosts.
> > 
> > Signed-off-by: York Sun <yorksun at freescale.com>
> > 
> > ---
> > 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(-)
> > 
> > diff --git a/include/compiler.h b/include/compiler.h index f853ed4..47c296e 100644
> > --- a/include/compiler.h
> > +++ b/include/compiler.h
> > @@ -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>
> > diff --git a/include/linux/types.h b/include/linux/types.h index c7e8fdb..6f75be4
> > 100644
> > --- a/include/linux/types.h
> > +++ b/include/linux/types.h
> > @@ -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.
> > --
> > 1.7.9.5
> 
> Acked-by: Aneesh Bansal <aneesh.bansal at freescale.com>

Applied to u-boot/master, thanks!

-- 
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>