diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
| commit | 1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /include/asm-x86/resume-trace.h | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| parent | ae94b8075a2ed58d2318ef03827b25bc844f844e (diff) | |
| download | talos-op-linux-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.gz talos-op-linux-1ba89386db0a3f39590b90b5dd20d7149ae52de0.zip | |
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'include/asm-x86/resume-trace.h')
| -rw-r--r-- | include/asm-x86/resume-trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h index 2557514d7ef6..8d9f0b41ee86 100644 --- a/include/asm-x86/resume-trace.h +++ b/include/asm-x86/resume-trace.h @@ -6,7 +6,7 @@ #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" \ |
