Messages in this thread | | | Date | Mon, 25 Jun 2012 21:00:53 +0900 | From | Paul Mundt <> | Subject | Re: [PATCH] bug.h: Fix up x86 build regression |
| |
On Mon, Jun 25, 2012 at 11:42:15AM +0200, Ingo Molnar wrote: > > * Paul Mundt <lethal@linux-sh.org> 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@canb.auug.org.au> > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Paul Mundt <lethal@linux-sh.org> > > 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
| |