X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=48e1760174569e449a330c766a7c3fca3ecba206;hb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;hp=ec44502318d8ec132eb3835e8bdc828112010724;hpb=3834b99f4341209754c4955ec853dc250b33ed4b;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index ec445023..48e17601 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-events.c
  *
  * Holds LTTng per-session event registry.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*
@@ -2809,12 +2796,22 @@ static int __init lttng_events_init(void)
 	ret = lttng_init_cpu_hotplug();
 	if (ret)
 		goto error_hotplug;
-	printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)\n",
+	printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)%s%s\n",
 		__stringify(LTTNG_MODULES_MAJOR_VERSION),
 		__stringify(LTTNG_MODULES_MINOR_VERSION),
 		__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
 		LTTNG_MODULES_EXTRAVERSION,
-		LTTNG_VERSION_NAME);
+		LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+		LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+		"",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+		LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+		"");
+#endif
 	return 0;
 
 error_hotplug:
@@ -2827,12 +2824,22 @@ error_kmem:
 	lttng_tracepoint_exit();
 error_tp:
 	lttng_context_exit();
-	printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)\n",
+	printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)%s%s\n",
 		__stringify(LTTNG_MODULES_MAJOR_VERSION),
 		__stringify(LTTNG_MODULES_MINOR_VERSION),
 		__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
 		LTTNG_MODULES_EXTRAVERSION,
-		LTTNG_VERSION_NAME);
+		LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+		LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+		"",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+		LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+		"");
+#endif
 	return ret;
 }
 
@@ -2850,19 +2857,36 @@ static void __exit lttng_events_exit(void)
 	kmem_cache_destroy(event_cache);
 	lttng_tracepoint_exit();
 	lttng_context_exit();
-	printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)\n",
+	printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)%s%s\n",
 		__stringify(LTTNG_MODULES_MAJOR_VERSION),
 		__stringify(LTTNG_MODULES_MINOR_VERSION),
 		__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
 		LTTNG_MODULES_EXTRAVERSION,
-		LTTNG_VERSION_NAME);
+		LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+		LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+		"",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+		LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+		"");
+#endif
 }
 
 module_exit(lttng_events_exit);
 
+#include "extra_version/patches.i"
+#ifdef LTTNG_EXTRA_VERSION_GIT
+MODULE_INFO(extra_version_git, LTTNG_EXTRA_VERSION_GIT);
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+MODULE_INFO(extra_version_name, LTTNG_EXTRA_VERSION_NAME);
+#endif
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
-MODULE_DESCRIPTION("LTTng Events");
+MODULE_DESCRIPTION("LTTng tracer");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)