Fix: NULL pointer dereference of THIS_MODULE with built-in modules

[lttng-modules.git] / lttng-context.c

diff --git a/lttng-context.c b/lttng-context.c
index d299d5e2e97412f90e05dec1e78295ebd01a2fd3..406f479de92994217b2c1e5c480086752b173e27 100644 (file)
--- 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;
 }