x86: merge resume-trace.h variants

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h
index b5006eb..8661ae7 100644 (file)
--- a/include/asm-x86/asm.h
+++ b/include/asm-x86/asm.h
@@ -6,12 +6,14 @@
 
 # define _ASM_PTR      " .long "
 # define _ASM_ALIGN    " .balign 4 "
+# define _ASM_MOV_UL   " movl "
 
 #else
 /* 64 bits */
 
 # define _ASM_PTR      " .quad "
 # define _ASM_ALIGN    " .balign 8 "
+# define _ASM_MOV_UL   " movq "
 
 #endif /* CONFIG_X86_32 */
 

diff --cc include/asm-x86/resume-trace.h
Simple merge

diff --cc include/asm-x86/resume-trace_32.h
Simple merge

diff --cc include/asm-x86/resume-trace_64.h
Simple merge