X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fshm.c;h=994204d1e0a2463829a8e73e3cb0cf078eae1c0f;hb=25c9a6e9fdb95d9d1c57463ab513ab1db197128d;hp=fd0919fac3b75ad057e9c0aed87efd676847a76a;hpb=824f40b81426c6ac82685251018dae00947786a9;p=lttng-ust.git

diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index fd0919fa..994204d1 100644
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -16,7 +16,8 @@
 #include <stdio.h>
 #include <signal.h>
 #include <dirent.h>
-#include <ust/align.h>
+#include <lttng/align.h>
+#include <helper.h>
 
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj)
 {
@@ -203,11 +204,13 @@ void shmp_object_destroy(struct shm_object *obj)
 {
 	int ret, i;
 
-        ret = munmap(obj->memory_map, obj->memory_map_size);
-        if (ret) {
-                PERROR("umnmap");
-                assert(0);
-        }
+	if (!obj->is_shadow) {
+		ret = munmap(obj->memory_map, obj->memory_map_size);
+		if (ret) {
+			PERROR("umnmap");
+			assert(0);
+		}
+	}
 	ret = close(obj->shm_fd);
 	if (ret) {
 		PERROR("close");