From a3bb4b278286aaa20867ba68bd5b5a5853974126 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 18 Nov 2011 12:41:10 -0500
Subject: [PATCH] Compile fix following moved headers

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/lttng/ringbuffer-config.h           | 2 --
 liblttng-ust/ltt-probes.c                   | 1 +
 libringbuffer/backend_types.h               | 1 +
 libringbuffer/frontend_types.h              | 1 +
 tests/ust-basic-tracing/ust-basic-tracing.c | 2 +-
 tests/ust-multi-test/ust-multi-test.c       | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 513da2f6..1ff5858c 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -319,6 +319,4 @@ int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *
 	return 0;
 }
 
-#include <lttng/vatomic.h>
-
 #endif /* _LINUX_RING_BUFFER_CONFIG_H */
diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index 66ee971c..fda35bf9 100644
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -13,6 +13,7 @@
 #include <urcu/list.h>
 #include <lttng/core.h>
 #include <lttng/ust-events.h>
+#include <assert.h>
 
 #include "ltt-tracer-core.h"
 
diff --git a/libringbuffer/backend_types.h b/libringbuffer/backend_types.h
index 7417506e..7300309f 100644
--- a/libringbuffer/backend_types.h
+++ b/libringbuffer/backend_types.h
@@ -13,6 +13,7 @@
 
 #include <limits.h>
 #include "shm_internal.h"
+#include "vatomic.h"
 
 struct lttng_ust_lib_ring_buffer_backend_pages {
 	unsigned long mmap_offset;	/* offset of the subbuffer in mmap */
diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 0a048845..9c733d17 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -27,6 +27,7 @@
 #include <lttng/ringbuffer-config.h>
 #include "backend_types.h"
 #include "shm_internal.h"
+#include "vatomic.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index 43628bd4..ea0636bc 100644
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <lttng/ust-comm.h>
+#include <ust-comm.h>
 #include "../../libringbuffer/backend.h"
 #include "../../libringbuffer/frontend.h"
 
diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index 541ed44b..b0ef25a4 100644
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <lttng/ust-comm.h>
+#include <ust-comm.h>
 #include <../../libringbuffer/backend.h>
 #include <../../libringbuffer/frontend.h>
 
-- 
2.34.1