From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 12:30:38 +0000 (+0100)
Subject: x86: merge resume-trace.h variants
X-Git-Tag: v2.6.25-rc1~1143^2~755
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3578facf737dc9a60ed19a83458bd9cfdc2af233;p=pandora-kernel.git

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 b5006eb9acba..8661ae75488a 100644
--- 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 */
 
Reading git-diff-tree failed