summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/resume-trace.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:30:38 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:38 +0100
commit3578facf737dc9a60ed19a83458bd9cfdc2af233 (patch)
tree7e025ccef144287fff8aaf538c7f944ca60fe6c0 /include/asm-x86/resume-trace.h
parent3367e56f26a3a8647784328ffa846fe8021a5b79 (diff)
downloadblackbird-op-linux-3578facf737dc9a60ed19a83458bd9cfdc2af233.tar.gz
blackbird-op-linux-3578facf737dc9a60ed19a83458bd9cfdc2af233.zip
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/resume-trace.h')
-rw-r--r--include/asm-x86/resume-trace.h23
1 files changed, 19 insertions, 4 deletions
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h
index 9b6dd093a9f7..46f725b0bc82 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"
+#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
OpenPOWER on IntegriCloud