Move include/ust/ to include/lttng/

[lttng-ust.git] / libringbuffer / smp.h

diff --git a/libringbuffer/smp.h b/libringbuffer/smp.h
index 3d138a9a890ce69afede6b5975a334556823be39..755c65fc52fb53e91ee59ddbd415cc0468cec2bf 100644 (file)
--- 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.