Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

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

diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h
index 46f725b0bc823e5e73bbbeff1327f948ed9b1c5c..8d9f0b41ee86ca40f7f9b19d02f43c76348e1069 100644 (file)
--- a/include/asm-x86/resume-trace.h
+++ b/include/asm-x86/resume-trace.h
@@ -3,16 +3,17 @@
 
 #include <asm/asm.h>
 
-#define TRACE_RESUME(user) do {                                        \
+#define TRACE_RESUME(user)                                     \
+do {                                                           \
        if (pm_trace_enabled) {                                 \
-               void *tracedata;                                \
+               const 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__));      \
+                            ".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)