aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/asm.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:38 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:38 -0500
commit3578facf737dc9a60ed19a83458bd9cfdc2af233 (patch)
tree7e025ccef144287fff8aaf538c7f944ca60fe6c0 /include/asm-x86/asm.h
parent3367e56f26a3a8647784328ffa846fe8021a5b79 (diff)
x86: merge resume-trace.h variants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/asm.h')
-rw-r--r--include/asm-x86/asm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h
index b5006eb9acba..8661ae75488a 100644
--- a/include/asm-x86/asm.h
+++ b/include/asm-x86/asm.h
@@ -6,12 +6,14 @@
6 6
7# define _ASM_PTR " .long " 7# define _ASM_PTR " .long "
8# define _ASM_ALIGN " .balign 4 " 8# define _ASM_ALIGN " .balign 4 "
9# define _ASM_MOV_UL " movl "
9 10
10#else 11#else
11/* 64 bits */ 12/* 64 bits */
12 13
13# define _ASM_PTR " .quad " 14# define _ASM_PTR " .quad "
14# define _ASM_ALIGN " .balign 8 " 15# define _ASM_ALIGN " .balign 8 "
16# define _ASM_MOV_UL " movq "
15 17
16#endif /* CONFIG_X86_32 */ 18#endif /* CONFIG_X86_32 */
17 19