Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab15247 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

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 95695547
|("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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090306160833.GB7420@localhost>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 31bbed52

arch/x86/include/asm/linkage.h

+10 −6
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ 
#undef notrace

#define notrace __attribute__((no_instrument_function))



#ifdef CONFIG_X86_64

#define __ALIGN .p2align 4,,15

#define __ALIGN_STR ".p2align 4,,15"

#endif



#ifdef CONFIG_X86_32

#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))

/*
@@ -50,16 +45,25 @@ 
	__asmlinkage_protect_n(ret, "g" (arg1), "g" (arg2), "g" (arg3), \

			      "g" (arg4), "g" (arg5), "g" (arg6))



#endif

#endif /* CONFIG_X86_32 */



#ifdef __ASSEMBLY__



#define GLOBAL(name)	\

	.globl name;	\

	name:



#ifdef CONFIG_X86_64

#define __ALIGN .p2align 4,,15

#define __ALIGN_STR ".p2align 4,,15"

#endif



#ifdef CONFIG_X86_ALIGNMENT_16

#define __ALIGN .align 16,0x90

#define __ALIGN_STR ".align 16,0x90"

#endif



#endif /* __ASSEMBLY__ */



#endif /* _ASM_X86_LINKAGE_H */