From: David Goulet <dgoulet@efficios.com>
Date: Mon, 30 Jan 2012 20:43:33 +0000 (-0500)
Subject: Merge branch 'master' into benchmark
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=7bb1478af7d1567a6842d0fc73c46315b65bbaf7;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

7bb1478af7d1567a6842d0fc73c46315b65bbaf7
diff --cc src/bin/lttng-sessiond/main.c
index acade53db,9b2d1fe00..170dcc587
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@@ -4229,7 -4158,8 +4229,10 @@@ int main(int argc, char **argv
  	void *status;
  	const char *home_path;
  
 +	tracepoint(sessiond_boot_start);
++
+ 	init_kernel_workarounds();
+ 
  	rcu_register_thread();
  
  	/* Create thread quit pipe */