Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3578facf737dc9a60ed19a83458bd9cfdc2af233
Commit:     3578facf737dc9a60ed19a83458bd9cfdc2af233
Parent:     3367e56f26a3a8647784328ffa846fe8021a5b79
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:30:38 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:30:38 2008 +0100

    x86: merge resume-trace.h variants
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 include/asm-x86/asm.h             |    2 ++
 include/asm-x86/resume-trace.h    |   25 ++++++++++++++++++++-----
 include/asm-x86/resume-trace_32.h |   13 -------------
 include/asm-x86/resume-trace_64.h |   13 -------------
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h
index b5006eb..8661ae7 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 */
 
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h
dissimilarity index 92%
index 9b6dd09..46f725b 100644
--- a/include/asm-x86/resume-trace.h
+++ b/include/asm-x86/resume-trace.h
@@ -1,5 +1,20 @@
-#ifdef CONFIG_X86_32
-# include "resume-trace_32.h"
-#else
-# include "resume-trace_64.h"
-#endif
+#ifndef _ASM_X86_RESUME_TRACE_H
+#define _ASM_X86_RESUME_TRACE_H
+
+#include <asm/asm.h>
+
+#define TRACE_RESUME(user) do {                                        \
+       if (pm_trace_enabled) {                                 \
+               void *tracedata;                                \
+               asm volatile(_ASM_MOV_UL " $1f,%0\n"            \
+                       ".section .tracedata,\"a\"\n"           \
+                       "1:\t.word %c1\n\t"                     \
+                       _ASM_PTR " %c2\n"                       \
+                       ".previous"                             \
+                       :"=r" (tracedata)                       \
+                       : "i" (__LINE__), "i" (__FILE__));      \
+               generate_resume_trace(tracedata, user);         \
+       }                                                       \
+} while (0)
+
+#endif
diff --git a/include/asm-x86/resume-trace_32.h 
b/include/asm-x86/resume-trace_32.h
deleted file mode 100644
index ec9cfd6..0000000
--- a/include/asm-x86/resume-trace_32.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define TRACE_RESUME(user) do {                                        \
-       if (pm_trace_enabled) {                                 \
-               void *tracedata;                                \
-               asm volatile("movl $1f,%0\n"                    \
-                       ".section .tracedata,\"a\"\n"           \
-                       "1:\t.word %c1\n"                       \
-                       "\t.long %c2\n"                         \
-                       ".previous"                             \
-                       :"=r" (tracedata)                       \
-                       : "i" (__LINE__), "i" (__FILE__));      \
-               generate_resume_trace(tracedata, user);         \
-       }                                                       \
-} while (0)
diff --git a/include/asm-x86/resume-trace_64.h 
b/include/asm-x86/resume-trace_64.h
deleted file mode 100644
index 34bf998..0000000
--- a/include/asm-x86/resume-trace_64.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define TRACE_RESUME(user) do {                                        \
-       if (pm_trace_enabled) {                                 \
-               void *tracedata;                                \
-               asm volatile("movq $1f,%0\n"                    \
-                       ".section .tracedata,\"a\"\n"           \
-                       "1:\t.word %c1\n"                       \
-                       "\t.quad %c2\n"                         \
-                       ".previous"                             \
-                       :"=r" (tracedata)                       \
-                       : "i" (__LINE__), "i" (__FILE__));      \
-               generate_resume_trace(tracedata, user);         \
-       }                                                       \
-} while (0)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to