aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-03-10 18:00:01 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-03-10 18:00:01 -0700
commit555367cac68f73c3990a6229ae6ea47ab4f38a0c (patch)
tree098b434d1c18d797a7207440c7e78bb2c67b40eb
parentb0f72c54536d67e23e4112d978be0d81fe6f573d (diff)
LINARO: fix compile error in ltt-tracerlinaro-natty-next
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/changelog1
-rw-r--r--ubuntu/lttng-modules/ltt-tracer.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 940443c61828..b5794342a4a5 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -30,6 +30,7 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low
- LP: #708883
* Enable CONFIG_TIMER_STATS
- LP: #718677
+ * Fix compile error in ltt-tracer
-- John Rigby <john.rigby@linaro.org> Thu, 10 Mar 2011 14:41:46 -0700
diff --git a/ubuntu/lttng-modules/ltt-tracer.c b/ubuntu/lttng-modules/ltt-tracer.c
index 24a3a92e8539..44d3d0f066d0 100644
--- a/ubuntu/lttng-modules/ltt-tracer.c
+++ b/ubuntu/lttng-modules/ltt-tracer.c
@@ -782,9 +782,12 @@ int ltt_trace_alloc(const char *trace_name)
kref_init(&trace->kref);
init_waitqueue_head(&trace->kref_wq);
trace->active = 0;
+#if 0
err = get_trace_clock();
if (err)
goto traces_error;
+#endif
+ get_trace_clock();
trace->freq_scale = trace_clock_freq_scale();
if (!trace->transport) {