From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 28 Feb 2014 17:30:04 +0000 (-0500)
Subject: Fix: load state dump even if work-around lookup fails
X-Git-Tag: v2.2.4~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=eaef2890eb65f2489e0227413ed3a0b228b3323b;p=lttng-modules.git

Fix: load state dump even if work-around lookup fails

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

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 7dd4f56e..b7921df4 100755
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -427,7 +427,14 @@ EXPORT_SYMBOL_GPL(lttng_statedump_start);
 static
 int __init lttng_statedump_init(void)
 {
-	return wrapper_lttng_fixup_sig(THIS_MODULE);
+	/*
+	 * Allow module to load even if the fixup cannot be done. This
+	 * will allow seemless transition when the underlying issue fix
+	 * is merged into the Linux kernel, and when tracepoint.c
+	 * "tracepoint_module_notify" is turned into a static function.
+	 */
+	(void) wrapper_lttng_fixup_sig(THIS_MODULE);
+	return 0;
 }
 
 module_init(lttng_statedump_init);
diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h
index 60b36856..5f429db7 100644
--- a/wrapper/tracepoint.h
+++ b/wrapper/tracepoint.h
@@ -59,7 +59,7 @@ int wrapper_tracepoint_module_notify(struct notifier_block *nb,
 	if (tracepoint_module_notify_sym) {
 		return tracepoint_module_notify_sym(nb, val, mod);
 	} else {
-		printk(KERN_WARNING "LTTng: tracepoint_module_notify symbol lookup failed.\n");
+		printk(KERN_WARNING "LTTng: tracepoint_module_notify symbol lookup failed. It probably means you kernel don't need this work-around. Please consider upgrading LTTng modules to make this warning go away.\n");
 		return -ENOSYS;
 	}
 }