X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=c52531f53bac8626c065958458b84c7cae2725ea;hb=54d2e210785c7d839615e4398455d11a75206fb7;hp=6830d86d100ac4ad4e49b5458f2518b463d609cc;hpb=cbef69018acdeb52d27529e80126b43f3733e233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 6830d86d..c52531f5 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -413,7 +413,7 @@ int get_wait_shm(struct sock_info *sock_info, size_t mmap_size)
 		 * shared memory map will have been created.
 		 */
 		pid = wait(&status);
-		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 			wait_shm_fd = -1;
 			goto end;
 		}
@@ -561,14 +561,14 @@ void wait_for_sessiond(struct sock_info *sock_info)
 		if (ret < 0) {
 			if (errno == EFAULT) {
 				wait_poll_fallback = 1;
-				WARN(
+				DBG(
 "Linux kernels 2.6.33 to 3.0 (with the exception of stable versions) "
 "do not support FUTEX_WAKE on read-only memory mappings correctly. "
 "Please upgrade your kernel "
 "(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
 "mainline). LTTng-UST will use polling mode fallback.");
+				PERROR("futex");
 			}
-			PERROR("futex");
 		}
 	}
 	return;