diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2011-03-16 19:05:57 -0400 |
---|---|---|
committer | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2011-03-16 19:05:57 -0400 |
commit | ec160c4c797190f21ddb19ebe945bd259c4875f2 (patch) | |
tree | c6a2585fcb9042b0ba113a3382e057d0687c983d /arch/x86/kernel | |
parent | 3181ff37cc46f72c01421e1c85965dcf10df8130 (diff) |
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/kernel')
-rw-r--r-- | arch/x86/kernel/trace-clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/trace-clock.c b/arch/x86/kernel/trace-clock.c index b6c9d1fbb41..ec866aa9591 100644 --- a/arch/x86/kernel/trace-clock.c +++ b/arch/x86/kernel/trace-clock.c @@ -186,7 +186,7 @@ static int __cpuinit hotcpu_callback(struct notifier_block *nb, return NOTIFY_OK; } -void get_trace_clock(void) +int get_trace_clock(void) { int cpu; @@ -212,6 +212,7 @@ void get_trace_clock(void) end: spin_unlock(&async_tsc_lock); put_online_cpus(); + return 0; } EXPORT_SYMBOL_GPL(get_trace_clock); |