From: Tom Rini Date: Wed, 16 Dec 2015 07:11:50 -0500 Subject: [U-Boot] [PATCH] Revert "include/linux: move typdef for uintptr_t" In-Reply-To: References: <1450246344-5960-1-git-send-email-yorksun@freescale.com> Message-ID: <20151216121150.GS17758@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > > Cc: trini at konsulko.com; Sun York-R58495 ; Bin Meng > > ; Bansal Aneesh-B39320 ; > > Simon Glass > > 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 > > > > --- > > 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 > > +#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 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 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: