X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fsmp.h;h=755c65fc52fb53e91ee59ddbd415cc0468cec2bf;hb=4d3c95233beec21079b6f895a7a55ae1421ee5cc;hp=3d138a9a890ce69afede6b5975a334556823be39;hpb=a6352fd40a2090fd883a6c369144bf405c9e9ec4;p=lttng-ust.git

diff --git a/libringbuffer/smp.h b/libringbuffer/smp.h
index 3d138a9a..755c65fc 100644
--- a/libringbuffer/smp.h
+++ b/libringbuffer/smp.h
@@ -9,7 +9,7 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#include <ust/core.h>
+#include <lttng/core.h>
 
 /*
  * 4kB of per-cpu data available. Enough to hold the control structures,
@@ -39,7 +39,7 @@ int get_cpu(void)
 	int cpu;
 
 	cpu = sched_getcpu();
-	if (likely(cpu >= 0))
+	if (caa_likely(cpu >= 0))
 		return cpu;
 	/*
 	 * If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.