X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context.c;h=406f479de92994217b2c1e5c480086752b173e27;hb=85abc967ae740e2140758a1eb8f66095f045b315;hp=933732266e9eb076ff26d0adefa1381a351b6399;hpb=f513b2bf88afa9a36a725fbf8e91e3a3f3efebc9;p=lttng-modules.git

diff --git a/lttng-context.c b/lttng-context.c
index 93373226..406f479d 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -144,6 +144,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
+			case atype_variant:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -166,6 +167,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
+			case atype_variant:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -187,6 +189,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 			case atype_struct:
 			case atype_array_compound:
 			case atype_sequence_compound:
+			case atype_variant:
 			default:
 				WARN_ON_ONCE(1);
 				break;
@@ -199,6 +202,7 @@ void lttng_context_update(struct lttng_ctx *ctx)
 		case atype_struct:
 		case atype_array_compound:
 		case atype_sequence_compound:
+		case atype_variant:
 			break;
 
 		case atype_enum:
@@ -296,18 +300,14 @@ int lttng_context_init(void)
 	if (ret) {
 		printk(KERN_WARNING "Cannot add context lttng_add_need_reschedule_to_ctx");
 	}
-#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT)
 	ret = lttng_add_preemptible_to_ctx(&lttng_static_ctx);
-	if (ret != -ENOSYS) {
+	if (ret && ret != -ENOSYS) {
 		printk(KERN_WARNING "Cannot add context lttng_add_preemptible_to_ctx");
 	}
-#endif
-#ifdef CONFIG_PREEMPT_RT_FULL
 	ret = lttng_add_migratable_to_ctx(&lttng_static_ctx);
-	if (ret != -ENOSYS) {
+	if (ret && ret != -ENOSYS) {
 		printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
 	}
-#endif
 	/* TODO: perf counters for filtering */
 	return 0;
 }