X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-net-ns.c;h=c97f6c29453c48be54ab4fc2fcd8df6bfff9beaa;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hp=c1ae97967ab5679d3b68c1328b40f0dcb9b4d4fc;hpb=a251a2090be0b47988cd78a448ea818293244ca1;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-net-ns.c b/liblttng-ust/lttng-context-net-ns.c
index c1ae9796..c97f6c29 100644
--- a/liblttng-ust/lttng-context-net-ns.c
+++ b/liblttng-ust/lttng-context-net-ns.c
@@ -38,11 +38,7 @@
  * We cache the result to ensure we don't stat(2) the proc filesystem on
  * each event.
  */
-#ifdef CONFIG_RCU_TLS
-static DEFINE_URCU_TLS(ino_t, cached_net_ns) = NS_INO_UNINITIALIZED;
-#else
 static DEFINE_URCU_TLS_INIT(ino_t, cached_net_ns, NS_INO_UNINITIALIZED);
-#endif
 
 static
 ino_t get_net_ns(void)
@@ -146,12 +142,12 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "net_ns";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(ino_t);
-	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.basic.integer.base = 10;
-	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
+	field->event_field.type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(ino_t);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = net_ns_get_size;
 	field->record = net_ns_record;
 	field->get_value = net_ns_get_value;