]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
bug.h: Fix up powerpc build regression.
authorPaul Mundt <lethal@linux-sh.org>
Mon, 18 Jun 2012 04:54:17 +0000 (13:54 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 18:10:59 +0000 (11:10 -0700)
commit2603efa31a0377eeaa06723bded8a1d644dd4901
tree717894107d06b5ac5a3dfa19fb602555c366b92e
parenta1f42beb8e287482d1a802731d4fb7e2bdc2c703
bug.h: Fix up powerpc build regression.

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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-generic/bug.h