From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 24 Oct 2016 17:27:01 +0000 (-0400)
Subject: Fix: preemptible and migratable context error handling
X-Git-Tag: v2.10.0-rc1~41
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=d0e59d6f099f4663cc62bffb59d960cd4235064f

Fix: preemptible and migratable context error handling

When built against preempt-rt and preempt kernels, the "return 0" case
means success, but lttng-modules incorrectly prints an error in the
kernel log.

Given that we handle the -ENOSYS error in lttng_context_init, there is
no need to keep the ifdefs in that function.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-context.c b/lttng-context.c
index d299d5e2..406f479d 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -300,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;
 }