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 5d6be9425bf3faf230a1a4655a0bb8a65c5033d1..05e4449bbbdf18bb288416bbda5c0ee4114c1c8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,10 +55,6 @@ ifneq ($(KERNELRELEASE),)
                          lttng-filter-validator.o \
                          probes/lttng-probe-user.o
 
-    obj-$(CONFIG_LTTNG) += 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
@@ -84,6 +80,10 @@ ifneq ($(KERNELRELEASE),)
         -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
         echo "lttng-tracepoint.o" ; fi;)
 
+    obj-$(CONFIG_LTTNG) += lttng-statedump.o
+    lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+                            wrapper/fdtable.o
+
     obj-$(CONFIG_LTTNG) += probes/
     obj-$(CONFIG_LTTNG) += lib/
 

diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c
index ed2a2a926ebf0c9b38e768184d0fee1f15fec250..94126afd1801df5388494d18ac5eb7c7f92d86a7 100644 (file)
--- a/lttng-context-cpu-id.c
+++ b/lttng-context-cpu-id.c
@@ -85,11 +85,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 7d9f0816851697a9b96f76e87490d5d141c71214..cd414c092b15bfb7e2d55259ca94d211d614aa0a 100644 (file)
--- a/lttng-context-hostname.c
+++ b/lttng-context-hostname.c
@@ -118,11 +118,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-interruptible.c b/lttng-context-interruptible.c
index b608a6e27038927fb5bea478456c20d90d3e86a8..295b10dc36254947af0096b081d584f5b652fa61 100644 (file)
--- a/lttng-context-interruptible.c
+++ b/lttng-context-interruptible.c
@@ -92,11 +92,3 @@ int lttng_add_interruptible_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_interruptible_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit interruptible 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-migratable.c b/lttng-context-migratable.c
index 1aaedf6acdbf8c641dfbd05cb719962d43bdd749..ef0c4edf0ad3e24754818526bd38d04941a0f745 100644 (file)
--- a/lttng-context-migratable.c
+++ b/lttng-context-migratable.c
@@ -85,11 +85,3 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_migratable_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit migratable 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-need-reschedule.c b/lttng-context-need-reschedule.c
index 82f2d61406c572d0e24f8a13b974d13f18b85a17..b0ea6d1ca369578e8ba8ab644379c73f36e5fbd3 100644 (file)
--- a/lttng-context-need-reschedule.c
+++ b/lttng-context-need-reschedule.c
@@ -85,11 +85,3 @@ int lttng_add_need_reschedule_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_need_reschedule_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit need_reschedule 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-nice.c b/lttng-context-nice.c
index b2d7705f43e535ebf2c1ed8667ba15fbcc15601b..2ad3841db12b0e62e5d81f347ea41ebba8a6132f 100644 (file)
--- a/lttng-context-nice.c
+++ b/lttng-context-nice.c
@@ -85,11 +85,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 5ad92c14e10ab923deb2c1cebe9240ad9c423c04..3428be6077ba5470c636fd40bb2694e92fbeac9d 100644 (file)
--- a/lttng-context-pid.c
+++ b/lttng-context-pid.c
@@ -85,11 +85,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 28c97b58ff77f70208c0d19f409966b19667e885..7323b881489ac1c1c3debb1aba332967a800b7b6 100644 (file)
--- a/lttng-context-ppid.c
+++ b/lttng-context-ppid.c
@@ -107,11 +107,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-preemptible.c b/lttng-context-preemptible.c
index d4d474cf9740270b8ee5badd1c60b5a65d010013..70534147fad58ff0c5779e3a81b2f08accd5bd27 100644 (file)
--- a/lttng-context-preemptible.c
+++ b/lttng-context-preemptible.c
@@ -103,11 +103,3 @@ int lttng_add_preemptible_to_ctx(struct lttng_ctx **ctx)
        return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_preemptible_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit preemptible 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 9da51a22d983312d02a0b7d48e18734215d3a3b3..5a27e048251b63930a91f7838bc4504faf7a65b7 100644 (file)
--- a/lttng-context-prio.c
+++ b/lttng-context-prio.c
@@ -106,11 +106,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 8a747acd3697f0ed61d12141866e09c3f3ae6965..6b5e90ab91a5178f9e2ef1bbb8208fd1a7a80917 100644 (file)
--- a/lttng-context-procname.c
+++ b/lttng-context-procname.c
@@ -89,11 +89,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 12862659f18080d42496636185125d302cafa38c..3eded5b3c458a578fb881b93ae142c847b0d8f0e 100644 (file)
--- a/lttng-context-tid.c
+++ b/lttng-context-tid.c
@@ -88,11 +88,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 6fa1c00d2c76be529d7e146b6cbb157d913d4ec2..a2080f1badb1913f0bfdd88719ec7a7d92cba58f 100644 (file)
--- a/lttng-context-vpid.c
+++ b/lttng-context-vpid.c
@@ -100,11 +100,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 8a7d172fca89bc543abd2e2f55cdb55392d0b5c8..9e7e54d172aec625845fc5ebda06d42edb1f1b09 100644 (file)
--- a/lttng-context-vppid.c
+++ b/lttng-context-vppid.c
@@ -129,11 +129,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 a37bb7673736fa1e10fbab451877cba7234c1576..425f36813750e04a2c025d118044d97f7ec5472f 100644 (file)
--- a/lttng-context-vtid.c
+++ b/lttng-context-vtid.c
@@ -100,11 +100,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);