---

yaml --- r: 79820 b: refs/heads/master c: 3578fac h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · 13a2210 · 13a2210
1 parent 1432c51
commit 13a2210
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 31 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3367e56f26a3a8647784328ffa846fe8021a5b79
+refs/heads/master: 3578facf737dc9a60ed19a83458bd9cfdc2af233
diff --git a/trunk/include/asm-x86/asm.h b/trunk/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/trunk/include/asm-x86/resume-trace.h b/trunk/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"
+#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/trunk/include/asm-x86/resume-trace_32.h b/trunk/include/asm-x86/resume-trace_32.h
diff --git a/trunk/include/asm-x86/resume-trace_64.h b/trunk/include/asm-x86/resume-trace_64.h