Subject: Re: linux-next: build failure after merge of the final tree

From: Phil Carmody <[email-masked]>
Date: Thu, 24 Jun 2010 13:18:05 +0300

On 24/06/10 11:00 +0200, ext Catalin Marinas wrote:
> On Thu, 2010-06-24 at 10:36 +1000, Stephen Rothwell wrote:
> > Hi Russell,
> > 
> > On Thu, 24 Jun 2010 02:19:49 +1000 Stephen Rothwell <[email-masked]> wrote:
> > >
> > > After merging the final tree, the next-20100616 and later linux-next
> > > builds for most arm configs (including versatile_defconfig) failed like this:
> > > 
> > > In file included from include/linux/module.h:23,
> > >                  from include/linux/device.h:23,
> > >                  from include/linux/dma-mapping.h:4,
> > >                  from arch/arm/kernel/asm-offsets.c:15:
> > > include/trace/events/module.h:11: error: two or more data types in declaration 
> > > 
> > > Reverting commit f0028612a8ffedcdafa8b7ae83ab090d8b0318b4 ("ARM: 6171/1:
> > > module - simplify unwind table handling") (and
> > > cecaa4c6b8173b02c9f7ecfdbbc81f573a7a9f33 ("ARM: 6172/1: module -
> > > additional unwind tables for exit/devexit sections") that depends on it)
> > > fixes this build error.
> > 
> > I have reverted those 2 commits in linux-next today.
> 
> Thanks. Stephen, do you build with just the standard defconfig for
> ARCH=arm?
> 
> The problem is commit f0028612a8f which contains the hunk below for
> the !ARM_UNWIND case):
> 
> +struct mod_arch_specific {
> +}
> 
> Phil, could you please add a semicolon after '}' and send Russell a
> patch?

Such a patch has already been sent by Peter Huewe, last week:
http://lkml.org/lkml/2010/6/17/73

Phil