diff options
author | 2008-07-18 19:53:16 +0200 | |
---|---|---|
committer | 2008-07-18 19:53:16 +0200 | |
commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /include/asm-x86/resume-trace.h | |
parent | nohz: prevent tick stop outside of the idle loop (diff) | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (diff) | |
download | linux-dev-9b610fda0df5d0f0b0c64242e37441ad1b384aac.tar.xz linux-dev-9b610fda0df5d0f0b0c64242e37441ad1b384aac.zip |
Merge branch 'linus' into timers/nohz
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" \ |