X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-ust.git;a=blobdiff_plain;f=include%2Flttng%2Fust-abi.h;h=4976b1bf61ce4786c1288933e29f0f4dcb6fb315;hp=f76d2a9fa5c6b25c3d99b96a21314eb1ed86d227;hb=b2c5f61a9cb94a79c35167450666e540b3e0fffe;hpb=2df586a6d8136c08cf5f0b1210a268d6c37601de

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index f76d2a9f..4976b1bf 100644
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -177,7 +177,12 @@ struct lttng_ust_channel_attr {
 	unsigned int switch_timer_interval;	/* usec */
 	unsigned int read_timer_interval;	/* usec */
 	enum lttng_ust_output output;		/* splice, mmap */
-	char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
+	union {
+		struct {
+			int64_t blocking_timeout;	/* Blocking timeout (usec) */
+		} s;
+		char padding[LTTNG_UST_CHANNEL_ATTR_PADDING];
+	} u;
 } LTTNG_PACKED;
 
 #define LTTNG_UST_TRACEPOINT_ITER_PADDING	16