diff mbox

ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c

Message ID 1346305152-14618-1-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn Aug. 30, 2012, 5:39 a.m. UTC
Linux-next has failed to compile for kirkwood since 23 August with:

arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)

Add missing <linux/sizes.h>

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/mach-kirkwood/db88f6281-bp-setup.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Jason Cooper Aug. 30, 2012, 5:12 p.m. UTC | #1
On Thu, Aug 30, 2012 at 07:39:12AM +0200, Andrew Lunn wrote:
> Linux-next has failed to compile for kirkwood since 23 August with:
> 
> arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
> arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)
> 
> Add missing <linux/sizes.h>
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Applied to: fixes-for-v3.6

Also, I added a CC for stable so greg can pick it up.

thx,

Jason.

> ---
>  arch/arm/mach-kirkwood/db88f6281-bp-setup.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
> index d933593..be90b7d 100644
> --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
> +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
> @@ -10,6 +10,7 @@
>  
>  #include <linux/kernel.h>
>  #include <linux/init.h>
> +#include <linux/sizes.h>
>  #include <linux/platform_device.h>
>  #include <linux/mtd/partitions.h>
>  #include <linux/ata_platform.h>
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Andrew Lunn Aug. 30, 2012, 6:08 p.m. UTC | #2
On Thu, Aug 30, 2012 at 01:12:36PM -0400, Jason Cooper wrote:
> On Thu, Aug 30, 2012 at 07:39:12AM +0200, Andrew Lunn wrote:
> > Linux-next has failed to compile for kirkwood since 23 August with:
> > 
> > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
> > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)
> > 
> > Add missing <linux/sizes.h>
> > 
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> 
> Applied to: fixes-for-v3.6
> 
> Also, I added a CC for stable so greg can pick it up.

Hi Jason

Stable does not need it. As i said, it only broke 23 August with
linux-next. So this is needed for only 3.7.

	    Andrew
Jason Cooper Aug. 30, 2012, 6:50 p.m. UTC | #3
On Thu, Aug 30, 2012 at 08:08:53PM +0200, Andrew Lunn wrote:
> On Thu, Aug 30, 2012 at 01:12:36PM -0400, Jason Cooper wrote:
> > On Thu, Aug 30, 2012 at 07:39:12AM +0200, Andrew Lunn wrote:
> > > Linux-next has failed to compile for kirkwood since 23 August with:
> > > 
> > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
> > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)
> > > 
> > > Add missing <linux/sizes.h>
> > > 
> > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > 
> > Applied to: fixes-for-v3.6
> > 
> > Also, I added a CC for stable so greg can pick it up.
> 
> Stable does not need it. As i said, it only broke 23 August with
> linux-next. So this is needed for only 3.7.

Do we know caused the break?  Is it a fix destined for -stable?

thx,

Jason.
Andrew Lunn Aug. 30, 2012, 6:59 p.m. UTC | #4
> > Stable does not need it. As i said, it only broke 23 August with
> > linux-next. So this is needed for only 3.7.
> 
> Do we know caused the break?  Is it a fix destined for -stable?

I've not bisected it.

     Andrew
Andrew Lunn Aug. 31, 2012, 5:47 a.m. UTC | #5
On Thu, Aug 30, 2012 at 02:50:50PM -0400, Jason Cooper wrote:
> On Thu, Aug 30, 2012 at 08:08:53PM +0200, Andrew Lunn wrote:
> > On Thu, Aug 30, 2012 at 01:12:36PM -0400, Jason Cooper wrote:
> > > On Thu, Aug 30, 2012 at 07:39:12AM +0200, Andrew Lunn wrote:
> > > > Linux-next has failed to compile for kirkwood since 23 August with:
> > > > 
> > > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
> > > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)
> > > > 
> > > > Add missing <linux/sizes.h>
> > > > 
> > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > > 
> > > Applied to: fixes-for-v3.6
> > > 
> > > Also, I added a CC for stable so greg can pick it up.
> > 
> > Stable does not need it. As i said, it only broke 23 August with
> > linux-next. So this is needed for only 3.7.
> 
> Do we know caused the break?  Is it a fix destined for -stable?

Hi Jason

If im groking the output from gcc -E correctly, it was this change:

http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=8f039ba3191e67bf48e560f5737d0c285720d4d8

The #include <asm/memory.h> has been dropped, and its from there that
it was getting <linux/sizes.h>.

This does not look like a change that will get backported to anything
earlier than 3.7.

	Andrew
Jason Cooper Aug. 31, 2012, 3:38 p.m. UTC | #6
On Fri, Aug 31, 2012 at 07:47:34AM +0200, Andrew Lunn wrote:
> On Thu, Aug 30, 2012 at 02:50:50PM -0400, Jason Cooper wrote:
> > On Thu, Aug 30, 2012 at 08:08:53PM +0200, Andrew Lunn wrote:
> > > On Thu, Aug 30, 2012 at 01:12:36PM -0400, Jason Cooper wrote:
> > > > On Thu, Aug 30, 2012 at 07:39:12AM +0200, Andrew Lunn wrote:
> > > > > Linux-next has failed to compile for kirkwood since 23 August with:
> > > > > 
> > > > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:29: error: 'SZ_1M' undeclared here (not in a function)
> > > > > arch/arm/mach-kirkwood/db88f6281-bp-setup.c:33: error: 'SZ_4M' undeclared here (not in a function)
> > > > > 
> > > > > Add missing <linux/sizes.h>
> > > > > 
> > > > > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > > > 
> > > > Applied to: fixes-for-v3.6
> > > > 
> > > > Also, I added a CC for stable so greg can pick it up.
> > > 
> > > Stable does not need it. As i said, it only broke 23 August with
> > > linux-next. So this is needed for only 3.7.
> > 
> > Do we know caused the break?  Is it a fix destined for -stable?
> 
> Hi Jason
> 
> If im groking the output from gcc -E correctly, it was this change:
> 
> http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=8f039ba3191e67bf48e560f5737d0c285720d4d8
> 
> The #include <asm/memory.h> has been dropped, and its from there that
> it was getting <linux/sizes.h>.
> 
> This does not look like a change that will get backported to anything
> earlier than 3.7.

Ok, Arnd and Olof haven't pulled yet, so I'll issue a new request
without the Cc -stable.

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index d933593..be90b7d 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -10,6 +10,7 @@ 
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/sizes.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
 #include <linux/ata_platform.h>