From: Michael Jeanson Date: Fri, 29 Jun 2018 21:28:31 +0000 (-0400) Subject: Cleanup: modinfo keys X-Git-Tag: v2.11.0-rc1~14 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=1c124020c743254923d8e76ab5dcd1f69709982e Cleanup: modinfo keys Remove duplicates keys, add missing keys, add missing information and fix the description of some modules. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c index 97be8356..a69d374e 100644 --- a/lib/ringbuffer/ring_buffer_vfs.c +++ b/lib/ringbuffer/ring_buffer_vfs.c @@ -459,8 +459,8 @@ const struct file_operations lib_ring_buffer_file_operations = { EXPORT_SYMBOL_GPL(lib_ring_buffer_file_operations); MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("Ring Buffer Library VFS"); +MODULE_AUTHOR("Mathieu Desnoyers "); +MODULE_DESCRIPTION("LTTng ring buffer library"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) diff --git a/lttng-context-callstack.c b/lttng-context-callstack.c index 432fadb6..0718114d 100644 --- a/lttng-context-callstack.c +++ b/lttng-context-callstack.c @@ -376,7 +376,3 @@ int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type) } } EXPORT_SYMBOL_GPL(lttng_add_callstack_to_ctx); - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Francis Giraldeau"); -MODULE_DESCRIPTION("Linux Trace Toolkit Callstack Support"); diff --git a/lttng-events.c b/lttng-events.c index c1f00ff5..de9e2198 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -2899,7 +2899,7 @@ MODULE_INFO(extra_version_name, LTTNG_EXTRA_VERSION_NAME); #endif MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); -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) diff --git a/lttng-ring-buffer-client-discard.c b/lttng-ring-buffer-client-discard.c index 62d8793a..bb7e58ae 100644 --- a/lttng-ring-buffer-client-discard.c +++ b/lttng-ring-buffer-client-discard.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "discard" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_SPLICE #include "lttng-ring-buffer-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Client Discard Mode"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-client-mmap-discard.c b/lttng-ring-buffer-client-mmap-discard.c index fa95d0ac..f345ed44 100644 --- a/lttng-ring-buffer-client-mmap-discard.c +++ b/lttng-ring-buffer-client-mmap-discard.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "discard-mmap" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_MMAP #include "lttng-ring-buffer-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Client Discard Mode"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-client-mmap-overwrite.c b/lttng-ring-buffer-client-mmap-overwrite.c index 76974791..cfc783f9 100644 --- a/lttng-ring-buffer-client-mmap-overwrite.c +++ b/lttng-ring-buffer-client-mmap-overwrite.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite-mmap" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_MMAP #include "lttng-ring-buffer-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Client Overwrite Mode"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-client-overwrite.c b/lttng-ring-buffer-client-overwrite.c index 0d20acb4..49acc1d4 100644 --- a/lttng-ring-buffer-client-overwrite.c +++ b/lttng-ring-buffer-client-overwrite.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_SPLICE #include "lttng-ring-buffer-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Client Overwrite Mode"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h index 7cf3a4c8..4700ae53 100644 --- a/lttng-ring-buffer-client.h +++ b/lttng-ring-buffer-client.h @@ -794,6 +794,10 @@ static void __exit lttng_ring_buffer_client_exit(void) module_exit(lttng_ring_buffer_client_exit); MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); +MODULE_AUTHOR("Mathieu Desnoyers "); MODULE_DESCRIPTION("LTTng ring buffer " RING_BUFFER_MODE_TEMPLATE_STRING " client"); +MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." + __stringify(LTTNG_MODULES_MINOR_VERSION) "." + __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) + LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-metadata-client.c b/lttng-ring-buffer-metadata-client.c index 71f4d562..efbf4c96 100644 --- a/lttng-ring-buffer-metadata-client.c +++ b/lttng-ring-buffer-metadata-client.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_SPLICE #include "lttng-ring-buffer-metadata-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Metadata Client"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-metadata-client.h b/lttng-ring-buffer-metadata-client.h index 1d03591b..bd27dd78 100644 --- a/lttng-ring-buffer-metadata-client.h +++ b/lttng-ring-buffer-metadata-client.h @@ -456,6 +456,10 @@ static void __exit lttng_ring_buffer_client_exit(void) module_exit(lttng_ring_buffer_client_exit); MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); +MODULE_AUTHOR("Mathieu Desnoyers "); MODULE_DESCRIPTION("LTTng ring buffer " RING_BUFFER_MODE_TEMPLATE_STRING " client"); +MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." + __stringify(LTTNG_MODULES_MINOR_VERSION) "." + __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) + LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-ring-buffer-metadata-mmap-client.c b/lttng-ring-buffer-metadata-mmap-client.c index c707a059..5f648a81 100644 --- a/lttng-ring-buffer-metadata-mmap-client.c +++ b/lttng-ring-buffer-metadata-mmap-client.c @@ -27,11 +27,3 @@ #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata-mmap" #define RING_BUFFER_OUTPUT_TEMPLATE RING_BUFFER_MMAP #include "lttng-ring-buffer-metadata-client.h" - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng Ring Buffer Metadata Client"); -MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." - __stringify(LTTNG_MODULES_MINOR_VERSION) "." - __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) - LTTNG_MODULES_EXTRAVERSION); diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 1c09e51a..37a4542e 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -560,7 +560,7 @@ module_exit(lttng_statedump_exit); MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Jean-Hugues Deschenes"); -MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Statedump"); +MODULE_DESCRIPTION("LTTng statedump provider"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c index 50675a4f..03d9d3bf 100644 --- a/probes/lttng-ftrace.c +++ b/probes/lttng-ftrace.c @@ -241,8 +241,8 @@ void lttng_ftrace_exit(void) module_exit(lttng_ftrace_exit) MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("Linux Trace Toolkit Ftrace Support"); +MODULE_AUTHOR("Mathieu Desnoyers "); +MODULE_DESCRIPTION("LTTng ftrace probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c index b58a09b4..32f43bd8 100644 --- a/probes/lttng-kprobes.c +++ b/probes/lttng-kprobes.c @@ -178,8 +178,8 @@ void lttng_kprobes_destroy_private(struct lttng_event *event) EXPORT_SYMBOL_GPL(lttng_kprobes_destroy_private); MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("Linux Trace Toolkit Kprobes Support"); +MODULE_AUTHOR("Mathieu Desnoyers "); +MODULE_DESCRIPTION("LTTng kprobes probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c index 49b7de82..d25862b1 100644 --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -311,8 +311,8 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event, EXPORT_SYMBOL_GPL(lttng_kretprobes_event_enable_state); MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("Linux Trace Toolkit Kretprobes Support"); +MODULE_AUTHOR("Mathieu Desnoyers "); +MODULE_DESCRIPTION("LTTng kretprobes probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) diff --git a/probes/lttng-probe-asoc.c b/probes/lttng-probe-asoc.c index 75234ecd..98c683a8 100644 --- a/probes/lttng-probe-asoc.c +++ b/probes/lttng-probe-asoc.c @@ -42,7 +42,9 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Paul Woegerer "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng asoc probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-jbd2.c b/probes/lttng-probe-jbd2.c index 2232e9cd..44a9b9af 100644 --- a/probes/lttng-probe-jbd2.c +++ b/probes/lttng-probe-jbd2.c @@ -42,7 +42,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng jbd2 probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-kmem.c b/probes/lttng-probe-kmem.c index ae3dc8b4..bfde8296 100644 --- a/probes/lttng-probe-kmem.c +++ b/probes/lttng-probe-kmem.c @@ -48,7 +48,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng kmem probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-module.c b/probes/lttng-probe-module.c index f2d1f290..a042425f 100644 --- a/probes/lttng-probe-module.c +++ b/probes/lttng-probe-module.c @@ -42,7 +42,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng module probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-power.c b/probes/lttng-probe-power.c index 834e85cf..00a49a01 100644 --- a/probes/lttng-probe-power.c +++ b/probes/lttng-probe-power.c @@ -42,7 +42,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng power probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-scsi.c b/probes/lttng-probe-scsi.c index 5cd5968c..7c669944 100644 --- a/probes/lttng-probe-scsi.c +++ b/probes/lttng-probe-scsi.c @@ -41,7 +41,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng scsi probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-skb.c b/probes/lttng-probe-skb.c index 9e1ca716..de6d8454 100644 --- a/probes/lttng-probe-skb.c +++ b/probes/lttng-probe-skb.c @@ -42,7 +42,8 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng skb probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c index 19d6b777..c4b0c500 100644 --- a/probes/lttng-probe-vmscan.c +++ b/probes/lttng-probe-vmscan.c @@ -42,7 +42,9 @@ #include MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); +MODULE_AUTHOR("Wade Farnsworth "); +MODULE_AUTHOR("Paul Woegerer "); +MODULE_AUTHOR("Andrew Gabbasov "); MODULE_DESCRIPTION("LTTng vmscan probes"); MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." __stringify(LTTNG_MODULES_MINOR_VERSION) "." diff --git a/tests/clock-plugin/lttng-clock-plugin-test.c b/tests/clock-plugin/lttng-clock-plugin-test.c index 55facb77..6fbd8455 100644 --- a/tests/clock-plugin/lttng-clock-plugin-test.c +++ b/tests/clock-plugin/lttng-clock-plugin-test.c @@ -23,6 +23,7 @@ #include #include +#include #include /* From lttng-modules */ static u64 trace_clock_read64_example(void) @@ -79,3 +80,7 @@ module_exit(lttng_clock_plugin_exit); MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); MODULE_DESCRIPTION("LTTng Clock Plugin Example"); +MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." + __stringify(LTTNG_MODULES_MINOR_VERSION) "." + __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) + LTTNG_MODULES_EXTRAVERSION);