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 9f5cb249c984a94ea154f0cdc2ee8f3cbf82b069..01e95aa965f3ddc7381b8a121d376c44abe0cd59 100644 (file)
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -282,18 +282,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;
 }