]> bbs.cooldavid.org Git - net-next-2.6.git/commit
x86: linkage.h - guard assembler specifics by __ASSEMBLY__
authorCyrill Gorcunov <gorcunov@gmail.com>
Fri, 6 Mar 2009 16:08:34 +0000 (19:08 +0300)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 16:14:12 +0000 (17:14 +0100)
commit7ab152470e8416ef2a44c800fdc157e2192f2974
tree51bdd828f3da594c062a2c9866574381408c1ff1
parent31bbed527e7039203920c51c9fb48c27aed0820c
x86: linkage.h - guard assembler specifics by __ASSEMBLY__

Stephen Rothwell reported:

|Today's linux-next build (x86_64 allmodconfig) produced this warning:
|
|In file included from drivers/char/epca.c:49:
|drivers/char/digiFep1.h:7:1: warning: "GLOBAL" redefined
|In file included from include/linux/linkage.h:5,
|                 from include/linux/kernel.h:11,
|                 from arch/x86/include/asm/system.h:10,
|                 from arch/x86/include/asm/processor.h:17,
|                 from include/linux/prefetch.h:14,
|                 from include/linux/list.h:6,
|                 from include/linux/module.h:9,
|                 from drivers/char/epca.c:29:
|arch/x86/include/asm/linkage.h:55:1: warning: this is the location of the previous definition
|
|Probably introduced by commit 95695547a7db44b88a7ee36cf5df188de267e99e
|("x86: asm linkage - introduce GLOBAL macro") from the x86 tree.

Any assembler specific snippets being placed in headers
are to be protected by __ASSEMBLY__. Fixed.

Also move __ALIGN definition under the same protection as well.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090306160833.GB7420@localhost>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/linkage.h