| Message ID | 20120217163057.8af53b853b36365b7fff203c@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, 2012-02-17 at 16:30 +1100, Stephen Rothwell wrote: > Hi Andrew, > > After merging the final tree, today's linux-next build (powerpc > allnoconfig) failed like this: > > In file included from include/linux/posix_types.h:47:0, > from include/linux/types.h:17, > from include/linux/page-flags.h:8, > from kernel/bounds.c:9: > arch/powerpc/include/asm/posix_types.h:15:14: error: conflicting types for '__kernel_size_t' > arch/powerpc/include/asm/posix_types.h:14:22: note: previous declaration of '__kernel_size_t' was here > In file included from include/linux/page-flags.h:8:0, > from kernel/bounds.c:9: > include/linux/types.h:68:1: error: unknown type name '__kernel_ssize_t' > > Caused by commit a9dbe86e5995 ("powerpc: use generic posix_types.h"). > > This think was pointed out a couple of days ago, so maybe Andrew needs a > newer version of the patch. Yes, I pointed that out to Peter a while back, maybe it got lost ... Cheers, Ben. > I added this fix patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Fri, 17 Feb 2012 16:25:48 +1100 > Subject: [PATCH] powerpc: use generic posix_types.h fix > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > arch/powerpc/include/asm/posix_types.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/powerpc/include/asm/posix_types.h b/arch/powerpc/include/asm/posix_types.h > index 1fbe027f..f139325 100644 > --- a/arch/powerpc/include/asm/posix_types.h > +++ b/arch/powerpc/include/asm/posix_types.h > @@ -12,7 +12,7 @@ typedef unsigned long __kernel_old_dev_t; > #define __kernel_old_dev_t __kernel_old_dev_t > #else > typedef unsigned int __kernel_size_t; > -typedef int __kernel_size_t; > +typedef int __kernel_ssize_t; > typedef long __kernel_ptrdiff_t; > #define __kernel_size_t __kernel_size_t > > -- > 1.7.9 >
diff --git a/arch/powerpc/include/asm/posix_types.h b/arch/powerpc/include/asm/posix_types.h index 1fbe027f..f139325 100644 --- a/arch/powerpc/include/asm/posix_types.h +++ b/arch/powerpc/include/asm/posix_types.h @@ -12,7 +12,7 @@ typedef unsigned long __kernel_old_dev_t; #define __kernel_old_dev_t __kernel_old_dev_t #else typedef unsigned int __kernel_size_t; -typedef int __kernel_size_t; +typedef int __kernel_ssize_t; typedef long __kernel_ptrdiff_t; #define __kernel_size_t __kernel_size_t
Hi Andrew, After merging the final tree, today's linux-next build (powerpc allnoconfig) failed like this: In file included from include/linux/posix_types.h:47:0, from include/linux/types.h:17, from include/linux/page-flags.h:8, from kernel/bounds.c:9: arch/powerpc/include/asm/posix_types.h:15:14: error: conflicting types for '__kernel_size_t' arch/powerpc/include/asm/posix_types.h:14:22: note: previous declaration of '__kernel_size_t' was here In file included from include/linux/page-flags.h:8:0, from kernel/bounds.c:9: include/linux/types.h:68:1: error: unknown type name '__kernel_ssize_t' Caused by commit a9dbe86e5995 ("powerpc: use generic posix_types.h"). This think was pointed out a couple of days ago, so maybe Andrew needs a newer version of the patch. I added this fix patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 17 Feb 2012 16:25:48 +1100 Subject: [PATCH] powerpc: use generic posix_types.h fix Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/posix_types.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)