X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Ftracepoint.h;h=e39a3849bc8b928bc7aaff2e5d4f5192eb300a5b;hb=d4419b81b243bc3a6bdd4a09b3ca2216d044a1c7;hp=c484353dc28ffbc2475cc35e24b676f074bfc3bb;hpb=1ea2c2dfbd051d7ab86a2161b48aa8e4a2f2b5e2;p=lttng-ust.git

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index c484353d..e39a3849 100644
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -77,7 +77,7 @@ struct tracepoint {
 
 #define __CHECK_TRACE(name, proto, args)				\
 	do {								\
-		if (unlikely(__tracepoint_##name.state))		\
+		if (caa_unlikely(__tracepoint_##name.state))		\
 			__DO_TRACE(&__tracepoint_##name,		\
 				TP_PROTO(proto), TP_ARGS(args));	\
 	} while (0)
@@ -99,7 +99,6 @@ struct tracepoint {
 	{								\
 		return __tracepoint_probe_register(#name, (void *)probe,\
 						 data);			\
-									\
 	}								\
 	static inline int						\
 	__unregister_trace_##name(void (*probe)(data_proto), void *data)\