ide: fix defining SUPPORT_VLB_SYNC

[sfrench/cifs-2.6.git] / include / linux / resume-trace.h

diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h
index a376bd4ade394fb99398ad3b905e7dc9fe981656..f3f4f28c6960cfabce8efd60f974f8d6dfd7eb62 100644 (file)
--- a/include/linux/resume-trace.h
+++ b/include/linux/resume-trace.h
@@ -2,23 +2,18 @@
 #define RESUME_TRACE_H
 
 #ifdef CONFIG_PM_TRACE
+#include <asm/resume-trace.h>
+
+extern int pm_trace_enabled;
 
 struct device;
 extern void set_trace_device(struct device *);
 extern void generate_resume_trace(void *tracedata, unsigned int user);
 
-#define TRACE_DEVICE(dev) set_trace_device(dev)
-#define TRACE_RESUME(user) do {                                \
-       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)
+#define TRACE_DEVICE(dev) do { \
+       if (pm_trace_enabled) \
+               set_trace_device(dev); \
+       } while(0)
 
 #else