diff options
| author | Richard Braun <rbraun@sceen.net> | 2012-10-15 22:00:12 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2012-10-15 22:00:12 +0200 |
| commit | 396311ff79582e3a78a175d519e5ebcca4e022f4 (patch) | |
| tree | 1eab36a9f5de73bb59712aab17b497624d72a1f0 /arch/x86/machine/asm.h | |
| parent | f2a3b2e722ad42b783ae7168adc22b64a71c6e26 (diff) | |
x86/asm: prefix macros with ASM_
Diffstat (limited to 'arch/x86/machine/asm.h')
| -rw-r--r-- | arch/x86/machine/asm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/machine/asm.h b/arch/x86/machine/asm.h index 6f1da5d..07b2d23 100644 --- a/arch/x86/machine/asm.h +++ b/arch/x86/machine/asm.h @@ -22,26 +22,26 @@ #ifdef __ASSEMBLY__ -#define ENTRY(x) \ +#define ASM_ENTRY(x) \ .align TEXT_ALIGN; \ .global x; \ .type x, STT_FUNC; \ x: -#define DATA(x) \ +#define ASM_DATA(x) \ .align DATA_ALIGN; \ .global x; \ .type x, STT_OBJECT; \ x: -#define END(x) \ -.size x, . - x; \ +#define ASM_END(x) \ +.size x, . - x; \ x ## _end: #ifdef __LP64__ -#define IRET iretq +#define ASM_IRET iretq #else /* __LP64__ */ -#define IRET iret +#define ASM_IRET iret #endif /* __LP64__ */ #endif /* __ASSEMBLY__ */ |