git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 2557514d7ef646cc066d976b1805b141fc685f83..8d9f0b41ee86ca40f7f9b19d02f43c76348e1069 100644
(file)
--- 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" \