Re: [PATCH] bug.h: Fix up x86 build regression

From: Paul Mundt
Date: Mon Jun 25 2012 - 08:01:34 EST


On Mon, Jun 25, 2012 at 11:42:15AM +0200, Ingo Molnar wrote:
>
> * Paul Mundt <lethal@xxxxxxxxxxxx> wrote:
>
> > The asm-generic/bug.h __ASSEMBLY__ guarding is completely bogus, which
> > tripped up the powerpc build when the kernel.h include was added:
> >
> > In file included from include/asm-generic/bug.h:5:0,
> > from arch/powerpc/include/asm/bug.h:127,
> > from arch/powerpc/kernel/head_64.S:31:
> > include/linux/kernel.h:44:0: warning: "ALIGN" redefined [enabled by default]
> > include/linux/linkage.h:57:0: note: this is the location of the previous definition
> > include/linux/sysinfo.h: Assembler messages:
> > include/linux/sysinfo.h:7: Error: Unrecognized opcode: `struct'
> > include/linux/sysinfo.h:8: Error: Unrecognized opcode: `__kernel_long_t'
> >
> > Moving the __ASSEMBLY__ guard up and stashing the kernel.h include under
> > it fixes this up, as well as covering the case the original fix was
> > attempting to handle.
> >
> > Tested-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
> > Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
>
> This commit broke most x86 !CONFIG_BUG builds in -rc4:
>
Yes, that was reported already and I've sent out a fix:

https://lkml.org/lkml/2012/6/25/98
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/