Fix: Define lttng-tracer metadata only once

Fixes sysfs trying to create the lttng-tracer module version node
multiple times.

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

diff --git a/Makefile b/Makefile
index 7c878f0589209fa893b21a29709091e08e202380..6bf4d2879a8d46d5bed3067b8b3c47f2b629fb82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,6 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
                        lttng-filter-validator.o \
                        probes/lttng-probe-user.o
 
-obj-m += lttng-statedump.o
-lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
-                       wrapper/fdtable.o
-
 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
 lttng-tracer-objs += lttng-syscalls.o
 endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
@@ -70,6 +66,10 @@ lttng-tracer-objs += $(shell \
                -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
                echo "lttng-tracepoint.o" ; fi;)
 
+obj-m += lttng-statedump.o
+lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+                       wrapper/fdtable.o
+
 obj-m += probes/
 obj-m += lib/
 

diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c
index 0738d9c7e5364f0b67b8afe38b36d8a821fb5ac9..8243c2f4adfade3446c55e0282898de80cd2c3cd 100644 (file)
--- a/lttng-context-cpu-id.c
+++ b/lttng-context-cpu-id.c
@@ -84,11 +84,3 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_cpu_id_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit CPU id Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-hostname.c b/lttng-context-hostname.c
index 28881d05b771eae420114334862610b19b22a265..0590207dfd33884f976d6054e0a76b1f0d34e9e6 100644 (file)
--- a/lttng-context-hostname.c
+++ b/lttng-context-hostname.c
@@ -117,11 +117,3 @@ int lttng_add_hostname_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_hostname_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-nice.c b/lttng-context-nice.c
index 412dd93af5299f67e8b679d9f1acaf5ad3839442..b2e631d8112c3e879493ee44e6b3c53612a66a4b 100644 (file)
--- a/lttng-context-nice.c
+++ b/lttng-context-nice.c
@@ -84,11 +84,3 @@ int lttng_add_nice_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_nice_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Nice Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index 0c74234c281711e44f9782bd182577ac7c72e3d2..467b71801a6529a14e2850a0d57148a89b0b26a1 100644 (file)
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -280,11 +280,3 @@ error_attr:
        kfree(events);
        return ret;
 }
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-pid.c b/lttng-context-pid.c
index 3211819d082097596e3802aa5c1620987c1162b7..207f88bea7d6e5bd7afbec8e12afa11a9f597b21 100644 (file)
--- a/lttng-context-pid.c
+++ b/lttng-context-pid.c
@@ -84,11 +84,3 @@ int lttng_add_pid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_pid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit PID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-ppid.c b/lttng-context-ppid.c
index 33ea1a796e0503d203b64cbd74db7420cb3fb534..f4d7c93d39c1fa7820f6b49becfbe6f2646367c8 100644 (file)
--- a/lttng-context-ppid.c
+++ b/lttng-context-ppid.c
@@ -106,11 +106,3 @@ int lttng_add_ppid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_ppid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit PPID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-prio.c b/lttng-context-prio.c
index d9fb6f31da74ad0fec12898a279466c88f2957a5..57b484e967af44466d0a2ca2a7036f34718040d7 100644 (file)
--- a/lttng-context-prio.c
+++ b/lttng-context-prio.c
@@ -105,11 +105,3 @@ int lttng_add_prio_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_prio_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Priority Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-procname.c b/lttng-context-procname.c
index 5c1cd3a6b04f7bf23f16239cb2131dffa2f8c755..d17d47b348beec90659b3ecd2fa904d4b9c9e914 100644 (file)
--- a/lttng-context-procname.c
+++ b/lttng-context-procname.c
@@ -88,11 +88,3 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_procname_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-tid.c b/lttng-context-tid.c
index 7b8e04bed21518520f3d3a2b45127b08dd2dfb15..7f3d4a11010cca0cdbf0b07aa3d26023a1dbd656 100644 (file)
--- a/lttng-context-tid.c
+++ b/lttng-context-tid.c
@@ -87,11 +87,3 @@ int lttng_add_tid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_tid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit TID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c
index 9a8df9a972b89f7c32dfa4335cde048f6b9ae1e5..dccaaccfe82d5387bfda9908fc94d887c11a8d84 100644 (file)
--- a/lttng-context-vpid.c
+++ b/lttng-context-vpid.c
@@ -99,11 +99,3 @@ int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vpid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vPID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c
index 9f36375db08f449d840742b831cfb04b25a213e4..80b1f9e7a20222f3e232e1089023abb839fbee58 100644 (file)
--- a/lttng-context-vppid.c
+++ b/lttng-context-vppid.c
@@ -128,11 +128,3 @@ int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vppid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vPPID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);

diff --git a/lttng-context-vtid.c b/lttng-context-vtid.c
index a264424fcf01510d766c1e053ea0e270dffd4efe..903e296ca1bbd94cb356a86d481a6e99b61f8b98 100644 (file)
--- a/lttng-context-vtid.c
+++ b/lttng-context-vtid.c
@@ -99,11 +99,3 @@ int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_vtid_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit vTID Context");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);