Fix: Define lttng-tracer metadata only once
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
AppliedMerged into master and stable-2.7, thanks!
Mathieu
Quoted 309 lines · ----- On Feb 10, 2016, at 11:08 AM, Michael Jeanson [email protected] wrote:
Fixes sysfs trying to create the lttng-tracer module version node multiple times.
Signed-off-by Michael Jeanson <[email protected]>---
Makefile | 8 ++++---- lttng-context-cpu-id.c | 8 -------- lttng-context-hostname.c | 8 -------- lttng-context-interruptible.c | 8 -------- lttng-context-migratable.c | 8 -------- lttng-context-need-reschedule.c | 8 -------- lttng-context-nice.c | 8 -------- lttng-context-perf-counters.c | 8 -------- lttng-context-pid.c | 8 -------- lttng-context-ppid.c | 8 -------- lttng-context-preemptible.c | 8 -------- lttng-context-prio.c | 8 -------- lttng-context-procname.c | 8 -------- lttng-context-tid.c | 8 -------- lttng-context-vpid.c | 8 -------- lttng-context-vppid.c | 8 -------- lttng-context-vtid.c | 8 -------- 17 files changed, 4 insertions(+), 132 deletions(-)Makefile +4
-4@@ -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/lttng-context-cpu-id.c +0
-8@@ -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);lttng-context-hostname.c +0
-8@@ -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);lttng-context-interruptible.c +0
-8@@ -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);lttng-context-migratable.c +0
-8@@ -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);lttng-context-need-reschedule.c +0
-8@@ -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);lttng-context-nice.c +0
-8@@ -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);lttng-context-perf-counters.c +0
-8@@ -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);lttng-context-pid.c +0
-8@@ -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);lttng-context-ppid.c +0
-8@@ -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);lttng-context-preemptible.c +0
-8@@ -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);lttng-context-prio.c +0
-8@@ -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);lttng-context-procname.c +0
-8@@ -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);lttng-context-tid.c +0
-8@@ -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);lttng-context-vpid.c +0
-8@@ -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);lttng-context-vppid.c +0
-8@@ -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);lttng-context-vtid.c +0
-9@@ -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); --2.7.0
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com