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

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

x86: shrink __ALIGN and __ALIGN_STR definitions 



Impact: cleanup

1) .p2align 4 and .align 16 are the same meaning
   (until a.out format for i386 is used which is
    not our case for CONFIG_X86_ALIGNMENT_16 anyway)

2) having 15 as max allowed bytes to be skipped
   does not make sense on modulo 16

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090309171951.GE9945@localhost>
[ small cleanup, use __stringify(), etc. ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 78b020d0

arch/x86/include/asm/linkage.h

+5 −8
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_LINKAGE_H

#ifndef _ASM_X86_LINKAGE_H

#define _ASM_X86_LINKAGE_H

#define _ASM_X86_LINKAGE_H





#include <linux/stringify.h>



#undef notrace

#undef notrace

#define notrace __attribute__((no_instrument_function))

#define notrace __attribute__((no_instrument_function))
@@ -53,14 +55,9 @@ 
	.globl name;	\

	.globl name;	\

	name:

	name:





#ifdef CONFIG_X86_64

#if defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)

#define __ALIGN .p2align 4,,15

#define __ALIGN		.p2align 4, 0x90

#define __ALIGN_STR ".p2align 4,,15"

#define __ALIGN_STR	__stringify(__ALIGN)

#endif



#ifdef CONFIG_X86_ALIGNMENT_16

#define __ALIGN .align 16,0x90

#define __ALIGN_STR ".align 16,0x90"

#endif

#endif





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */