More compile fixes

[lttng-ust.git] / liblttng-ust / tracepoint.c

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index 8bf875281a97769ed26f2d96974343427f7aa314..66e58d0a5a34bb8dfe2e6d931ce6ddb416930c7d 100644 (file)
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -22,14 +22,17 @@
 #define _LGPL_SOURCE
 #include <errno.h>
 #include <lttng/tracepoint.h>
-#include <lttng/tracepoint-internal.h>
 #include <lttng/core.h>
-#include <lttng/kcompat/kcompat.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <urcu/arch.h>
 #include <urcu-bp.h>
 #include <urcu/hlist.h>
 #include <urcu/uatomic.h>
+#include <urcu/compiler.h>
 
 #include <lttng/usterr-signal-safe.h>
+#include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 
 /* Set to 1 to enable tracepoint debug output */
@@ -89,7 +92,7 @@ static inline void *allocate_probes(int count)
 static inline void release_probes(void *old)
 {
        if (old) {
-               struct tp_probes *tp_probes = _ust_container_of(old,
+               struct tp_probes *tp_probes = caa_container_of(old,
                        struct tp_probes, probes[0]);
                synchronize_rcu();
                free(tp_probes);
@@ -196,7 +199,7 @@ static struct tracepoint_entry *get_tracepoint(const char *name)
        struct cds_hlist_head *head;
        struct cds_hlist_node *node;
        struct tracepoint_entry *e;
-       u32 hash = jhash(name, strlen(name), 0);
+       uint32_t hash = jhash(name, strlen(name), 0);
 
        head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
        cds_hlist_for_each_entry(e, node, head, hlist) {
@@ -216,7 +219,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name)
        struct cds_hlist_node *node;
        struct tracepoint_entry *e;
        size_t name_len = strlen(name) + 1;
-       u32 hash = jhash(name, name_len-1, 0);
+       uint32_t hash = jhash(name, name_len-1, 0);
 
        head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
        cds_hlist_for_each_entry(e, node, head, hlist) {
@@ -411,7 +414,7 @@ static void tracepoint_add_old_probes(void *old)
 {
        need_update = 1;
        if (old) {
-               struct tp_probes *tp_probes = _ust_container_of(old,
+               struct tp_probes *tp_probes = caa_container_of(old,
                        struct tp_probes, probes[0]);
                cds_list_add(&tp_probes->u.list, &old_probes);
        }