aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>2011-03-16 19:05:57 -0400
committerMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2011-03-16 19:05:57 -0400
commitec160c4c797190f21ddb19ebe945bd259c4875f2 (patch)
treec6a2585fcb9042b0ba113a3382e057d0687c983d /arch/x86/include
parent3181ff37cc46f72c01421e1c85965dcf10df8130 (diff)
downloadlinux-linaro-android-ec160c4c797190f21ddb19ebe945bd259c4875f2.tar.gz
trace-clock-get-may-fail
Trace clock get may fail ARM pmu reservation may fail, so we have to change the trace clock get prototype. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/trace-clock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/trace-clock.h b/arch/x86/include/asm/trace-clock.h
index ccdcb677aa5..01bc2f5221c 100644
--- a/arch/x86/include/asm/trace-clock.h
+++ b/arch/x86/include/asm/trace-clock.h
@@ -62,7 +62,7 @@ static inline u32 trace_clock_freq_scale(void)
return 1;
}
-extern void get_trace_clock(void);
+extern int get_trace_clock(void);
extern void put_trace_clock(void);
extern void set_trace_clock_is_sync(int state);