Skip to contentSkip to conversation

Cleanup: modinfo keys

PATCH New Michael Jeanson 2 participants 4 messages Jun 29, 2018 – Jul 5, 2018 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/4 Cleanup: modinfo keys

Remove duplicates keys, add missing keys, add missing information and fix the description of some modules.

---
 lib/ringbuffer/ring_buffer_vfs.c             | 4 ++--
 lttng-context-callstack.c                    | 4 ----
 lttng-events.c                               | 2 +-
 lttng-ring-buffer-client-discard.c           | 8 --------
 lttng-ring-buffer-client-mmap-discard.c      | 8 --------
 lttng-ring-buffer-client-mmap-overwrite.c    | 8 --------
 lttng-ring-buffer-client-overwrite.c         | 8 --------
 lttng-ring-buffer-client.h                   | 6 +++++-
 lttng-ring-buffer-metadata-client.c          | 8 --------
 lttng-ring-buffer-metadata-client.h          | 6 +++++-
 lttng-ring-buffer-metadata-mmap-client.c     | 8 --------
 lttng-statedump-impl.c                       | 2 +-
 probes/lttng-ftrace.c                        | 4 ++--
 probes/lttng-kprobes.c                       | 4 ++--
 probes/lttng-kretprobes.c                    | 4 ++--
 probes/lttng-probe-asoc.c                    | 4 +++-
 probes/lttng-probe-jbd2.c                    | 3 ++-
 probes/lttng-probe-kmem.c                    | 3 ++-
 probes/lttng-probe-module.c                  | 3 ++-
 probes/lttng-probe-power.c                   | 3 ++-
 probes/lttng-probe-scsi.c                    | 3 ++-
 probes/lttng-probe-skb.c                     | 3 ++-
 probes/lttng-probe-vmscan.c                  | 4 +++-
 tests/clock-plugin/lttng-clock-plugin-test.c | 5 +++++
 24 files changed, 43 insertions(+), 72 deletions(-)
lib/ringbuffer/ring_buffer_vfs.c +2 -2
index 97be835..a69d374 100644
@@ -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 <[email protected]>");
+MODULE_DESCRIPTION("LTTng ring buffer library");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
lttng-context-callstack.c +0 -4
index 432fadb..0718114 100644
@@ -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");
lttng-events.c +1 -1
index c1f00ff..de9e219 100644
@@ -2899,7 +2899,7 @@ MODULE_INFO(extra_version_name, LTTNG_EXTRA_VERSION_NAME);
 #endif
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <[email protected]>");
-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)
lttng-ring-buffer-client-discard.c +0 -8
index 62d8793..bb7e58a 100644
@@ -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);
lttng-ring-buffer-client-mmap-discard.c +0 -8
index fa95d0a..f345ed4 100644
@@ -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);
lttng-ring-buffer-client-mmap-overwrite.c +0 -8
index 7697479..cfc783f 100644
@@ -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);
lttng-ring-buffer-client-overwrite.c +0 -8
index 0d20acb..49acc1d 100644
@@ -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);
lttng-ring-buffer-client.h +5 -1
index 7cf3a4c..4700ae5 100644
@@ -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 <[email protected]>");
 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);
lttng-ring-buffer-metadata-client.c +0 -8
index 71f4d56..efbf4c9 100644
@@ -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);
lttng-ring-buffer-metadata-client.h +5 -1
index 1d03591..bd27dd7 100644
@@ -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 <[email protected]>");
 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);
lttng-ring-buffer-metadata-mmap-client.c +0 -8
index c707a05..5f648a8 100644
@@ -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);
lttng-statedump-impl.c +1 -1
index 1c09e51..37a4542 100644
@@ -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)
probes/lttng-ftrace.c +2 -2
index 50675a4..03d9d3b 100644
@@ -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 <[email protected]>");
+MODULE_DESCRIPTION("LTTng ftrace probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
probes/lttng-kprobes.c +2 -2
index b58a09b..32f43bd 100644
@@ -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 <[email protected]>");
+MODULE_DESCRIPTION("LTTng kprobes probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
probes/lttng-kretprobes.c +2 -2
index 49b7de8..d25862b 100644
@@ -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 <[email protected]>");
+MODULE_DESCRIPTION("LTTng kretprobes probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
 	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
probes/lttng-probe-asoc.c +3 -1
index 75234ec..98c683a 100644
@@ -42,7 +42,9 @@
 #include <instrumentation/events/lttng-module/asoc.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]>, Paul Woegerer <[email protected]>, and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Paul Woegerer <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng asoc probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-jbd2.c +2 -1
index 2232e9c..44a9b9a 100644
@@ -42,7 +42,8 @@
 #include <instrumentation/events/lttng-module/jbd2.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng jbd2 probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-kmem.c +2 -1
index ae3dc8b..bfde829 100644
@@ -48,7 +48,8 @@
 #include <instrumentation/events/lttng-module/kmem.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng kmem probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-module.c +2 -1
index f2d1f29..a042425 100644
@@ -42,7 +42,8 @@
 #include <instrumentation/events/lttng-module/module.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng module probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-power.c +2 -1
index 834e85c..00a49a0 100644
@@ -42,7 +42,8 @@
 #include <instrumentation/events/lttng-module/power.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng power probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-scsi.c +2 -1
index 5cd5968..7c66994 100644
@@ -41,7 +41,8 @@
 #include <instrumentation/events/lttng-module/scsi.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng scsi probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-skb.c +2 -1
index 9e1ca71..de6d845 100644
@@ -42,7 +42,8 @@
 #include <instrumentation/events/lttng-module/skb.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]> and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng skb probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
probes/lttng-probe-vmscan.c +3 -1
index 19d6b77..c4b0c50 100644
@@ -42,7 +42,9 @@
 #include <instrumentation/events/lttng-module/mm_vmscan.h>
 
 MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <[email protected]>, Paul Woegerer <[email protected]>, and Andrew Gabbasov <[email protected]>");
+MODULE_AUTHOR("Wade Farnsworth <[email protected]>");
+MODULE_AUTHOR("Paul Woegerer <[email protected]>");
+MODULE_AUTHOR("Andrew Gabbasov <[email protected]>");
 MODULE_DESCRIPTION("LTTng vmscan probes");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
tests/clock-plugin/lttng-clock-plugin-test.c +5 -0
index 55facb7..6fbd845 100644
@@ -23,6 +23,7 @@
 #include <linux/hrtimer.h>
 #include <linux/time.h>
 
+#include <lttng-tracer.h>
 #include <lttng-clock.h>	/* 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 <[email protected]>");
 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);
Signature · 6 lines
2.17.1

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#2 lore raw

PATCH 3/4 Cleanup: move scripts to subdirectory

In reply to a message not in the archive
---
 Kbuild.common                                  | 18 ++++++++++--------
 README.md                                      |  7 ++++---
 .../abi-debian-version.sh                      |  1 +
 .../abi-fedora-version.sh                      |  1 +
 .../abi-rhel-version.sh                        |  1 +
 .../abi-sle-version.sh                         |  1 +
 built-in.sh => scripts/built-in.sh             |  1 +
 .../extra-version-git.sh                       |  0
 .../extra-version-name.sh                      |  0
 .../extra-version-patches.sh                   |  0
 .../rt-patch-version.sh                        |  1 +
 11 files changed, 20 insertions(+), 11 deletions(-)
 rename abi-debian-version.sh => scripts/abi-debian-version.sh (97%)
 rename abi-fedora-version.sh => scripts/abi-fedora-version.sh (92%)
 rename abi-rhel-version.sh => scripts/abi-rhel-version.sh (94%)
 rename abi-sle-version.sh => scripts/abi-sle-version.sh (95%)
 rename built-in.sh => scripts/built-in.sh (92%)
 rename extra-version-git.sh => scripts/extra-version-git.sh (100%)
 rename extra-version-name.sh => scripts/extra-version-name.sh (100%)
 rename extra-version-patches.sh => scripts/extra-version-patches.sh (100%)
 rename rt-patch-version.sh => scripts/rt-patch-version.sh (90%)
Kbuild.common +10 -8
index bd24e80..c7cbd0b 100644
@@ -1,52 +1,54 @@
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+
 # Work-around for distro-specific public modules ABI breakages.
 # Some distributions break the public module instrumentation ABI
 # compared to upstream stable kernels without providing other mean than
 # the kernel EXTRAVERSION to figure it out. Translate this information
 # into a define visible from the C preprocessor.
 
-DEB_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/abi-debian-version.sh $(CURDIR))
+DEB_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/abi-debian-version.sh $(CURDIR))
 
 ifneq ($(DEB_API_VERSION), 0)
   ccflags-y += -DDEBIAN_API_VERSION=$(DEB_API_VERSION)
 endif
 
-RHEL_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/abi-rhel-version.sh $(CURDIR))
+RHEL_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/abi-rhel-version.sh $(CURDIR))
 
 ifneq ($(RHEL_API_VERSION), 0)
   ccflags-y += -DRHEL_API_VERSION=$(RHEL_API_VERSION)
 endif
 
-SLE_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/abi-sle-version.sh $(CURDIR))
+SLE_API_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/abi-sle-version.sh $(CURDIR))
 
 ifneq ($(SLE_API_VERSION), 0)
   ccflags-y += -DSLE_API_VERSION=$(SLE_API_VERSION)
 endif
 
-FEDORA_REVISION_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/abi-fedora-version.sh $(CURDIR))
+FEDORA_REVISION_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/abi-fedora-version.sh $(CURDIR))
 
 ifneq ($(FEDORA_REVISION_VERSION), 0)
   ccflags-y += -DFEDORA_REVISION_VERSION=$(FEDORA_REVISION_VERSION)
 endif
 
-RT_PATCH_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/rt-patch-version.sh $(CURDIR))
+RT_PATCH_VERSION:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/rt-patch-version.sh $(CURDIR))
 
 ifneq ($(RT_PATCH_VERSION), 0)
   ccflags-y += -DRT_PATCH_VERSION=$(RT_PATCH_VERSION)
 endif
 
-EXTRA_VERSION_NAME:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-name.sh $(TOP_LTTNG_MODULES_DIR))
+EXTRA_VERSION_NAME:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/extra-version-name.sh $(TOP_LTTNG_MODULES_DIR))
 
 ifneq ($(EXTRA_VERSION_NAME), 0)
   ccflags-y += -DLTTNG_EXTRA_VERSION_NAME='"$(EXTRA_VERSION_NAME)"'
 endif
 
-EXTRA_VERSION_GIT:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-git.sh $(TOP_LTTNG_MODULES_DIR))
+EXTRA_VERSION_GIT:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/extra-version-git.sh $(TOP_LTTNG_MODULES_DIR))
 
 ifneq ($(EXTRA_VERSION_GIT), 0)
   ccflags-y += -DLTTNG_EXTRA_VERSION_GIT='"$(EXTRA_VERSION_GIT)"'
 endif
 
-EXTRA_VERSION_PATCHES:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-patches.sh $(TOP_LTTNG_MODULES_DIR))
+EXTRA_VERSION_PATCHES:=$(shell $(TOP_LTTNG_MODULES_DIR)/scripts/extra-version-patches.sh $(TOP_LTTNG_MODULES_DIR))
 
 # Starting with kernel 4.12, the ftrace header was moved to private headers
 # and as such is not available when building against distro headers instead
README.md +4 -3
index 93e2dd3..201a579 100644
@@ -45,9 +45,10 @@ kernel, do:
 ### Kernel built-in support
 
 It is also possible to build these modules as part of a kernel image. Simply
-run the [`built-in.sh`](built-in.sh) script with the path to your kernel
-source directory as an argument.  It will symlink the lttng-modules directory
-in the kernel sources and add an include in the kernel Makefile.
+run the [`scripts/built-in.sh`](scripts/built-in.sh) script with the path to
+your kernel source directory as an argument.  It will symlink the
+lttng-modules directory in the kernel sources and add an include in the kernel
+Makefile.
 
 Then configure your kernel as usual and enable the `CONFIG_LTTNG` option.
 
scripts/abi-debian-version.sh renamed from abi-debian-version.sh +1 -0
similarity index 97%
rename from abi-debian-version.sh
rename to scripts/abi-debian-version.sh
index 4f2c088..ee8dbd8 100755
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 # First argument is the path to the kernel headers.
 KPATH="$1"
scripts/abi-fedora-version.sh renamed from abi-fedora-version.sh +1 -0
similarity index 92%
rename from abi-fedora-version.sh
rename to scripts/abi-fedora-version.sh
index 52dd044..4153482 100755
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 # First argument is the path to the kernel headers.
 KPATH="$1"
scripts/abi-rhel-version.sh renamed from abi-rhel-version.sh +1 -0
similarity index 94%
rename from abi-rhel-version.sh
rename to scripts/abi-rhel-version.sh
index bd5328a..0296d8c 100755
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 # First argument is the path to the kernel headers.
 KPATH="$1"
scripts/abi-sle-version.sh renamed from abi-sle-version.sh +1 -0
similarity index 95%
rename from abi-sle-version.sh
rename to scripts/abi-sle-version.sh
index 0bd65b1..bd6d5f1 100755
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 # First argument is the path to the kernel headers.
 KPATH=$1
scripts/built-in.sh renamed from built-in.sh +1 -0
similarity index 92%
rename from built-in.sh
rename to scripts/built-in.sh
index 782985f..5e57e93 100755
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 set -e
 
scripts/extra-version-git.sh renamed from extra-version-git.sh +0 -0
similarity index 100%
rename from extra-version-git.sh
rename to scripts/extra-version-git.sh
scripts/extra-version-name.sh renamed from extra-version-name.sh +0 -0
similarity index 100%
rename from extra-version-name.sh
rename to scripts/extra-version-name.sh
scripts/extra-version-patches.sh renamed from extra-version-patches.sh +0 -0
similarity index 100%
rename from extra-version-patches.sh
rename to scripts/extra-version-patches.sh
scripts/rt-patch-version.sh renamed from rt-patch-version.sh +1 -0
similarity index 90%
rename from rt-patch-version.sh
rename to scripts/rt-patch-version.sh
index 6a00fef..2704965 100755
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
 
 # First argument is the path to the kernel headers.
 KPATH="$1"
Signature · 6 lines
2.17.1

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#3 lore raw

PATCH 4/4 Cleanup: move to kernel style SPDX license identifiers

In reply to a message not in the archive

The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. According to kernel documentation it has to be inserted on the first or second line of a file.

---
 Kconfig                                       |   2 +
 LICENSE                                       |  15 +-
 gpl-2.0.txt => LICENSES/GPL-2.0               |  44 +-
 LICENSES/LGPL-2.1                             | 503 +++++++++++++++++
 LICENSES/MIT                                  |  30 ++
 Makefile                                      |   4 +-
 filter-bytecode.h                             |  27 +-
 instrumentation/events/lttng-module/9p.h      |   2 +-
 .../events/lttng-module/arch/x86/exceptions.h |   1 +
 .../lttng-module/arch/x86/irq_vectors.h       |   1 +
 .../lttng-module/arch/x86/kvm/mmutrace.h      |   1 +
 .../events/lttng-module/arch/x86/kvm/trace.h  |   1 +
 instrumentation/events/lttng-module/asoc.h    |   1 +
 instrumentation/events/lttng-module/block.h   |   1 +
 instrumentation/events/lttng-module/btrfs.h   |   1 +
 .../events/lttng-module/compaction.h          |   1 +
 instrumentation/events/lttng-module/ext3.h    |   1 +
 instrumentation/events/lttng-module/ext4.h    |   1 +
 instrumentation/events/lttng-module/gpio.h    |   1 +
 instrumentation/events/lttng-module/i2c.h     |   1 +
 instrumentation/events/lttng-module/irq.h     |   1 +
 instrumentation/events/lttng-module/jbd.h     |   1 +
 instrumentation/events/lttng-module/jbd2.h    |   1 +
 instrumentation/events/lttng-module/kmem.h    |   1 +
 instrumentation/events/lttng-module/kvm.h     |   1 +
 instrumentation/events/lttng-module/lock.h    |   1 +
 .../events/lttng-module/lttng-statedump.h     |   1 +
 .../events/lttng-module/lttng-test.h          |   1 +
 instrumentation/events/lttng-module/lttng.h   |   1 +
 .../events/lttng-module/mm_vmscan.h           |   1 +
 instrumentation/events/lttng-module/module.h  |   1 +
 instrumentation/events/lttng-module/napi.h    |   1 +
 instrumentation/events/lttng-module/net.h     |   1 +
 instrumentation/events/lttng-module/power.h   |   1 +
 .../events/lttng-module/preemptirq.h          |   1 +
 instrumentation/events/lttng-module/printk.h  |   1 +
 instrumentation/events/lttng-module/random.h  |   1 +
 instrumentation/events/lttng-module/rcu.h     |   1 +
 instrumentation/events/lttng-module/regmap.h  |   1 +
 .../events/lttng-module/regulator.h           |   1 +
 instrumentation/events/lttng-module/rpc.h     |   1 +
 instrumentation/events/lttng-module/rpm.h     |   2 +-
 instrumentation/events/lttng-module/sched.h   |   1 +
 instrumentation/events/lttng-module/scsi.h    |   1 +
 instrumentation/events/lttng-module/signal.h  |   1 +
 instrumentation/events/lttng-module/skb.h     |   1 +
 instrumentation/events/lttng-module/sock.h    |   1 +
 instrumentation/events/lttng-module/timer.h   |   1 +
 instrumentation/events/lttng-module/udp.h     |   1 +
 instrumentation/events/lttng-module/v4l2.h    |   1 +
 .../events/lttng-module/workqueue.h           |   1 +
 .../events/lttng-module/writeback.h           |   1 +
 .../syscalls/lttng-syscalls-extractor/Kbuild  |   2 +
 .../lttng-syscalls-extractor.c                |  17 +-
 lgpl-2.1.txt                                  | 504 ------------------
 lib/Kbuild                                    |   2 +
 lib/align.h                                   |  23 +-
 lib/bitfield.h                                |  27 +-
 lib/bug.h                                     |  23 +-
 lib/prio_heap/lttng_prio_heap.c               |  21 +-
 lib/prio_heap/lttng_prio_heap.h               |  27 +-
 lib/ringbuffer/api.h                          |  23 +-
 lib/ringbuffer/backend.h                      |  23 +-
 lib/ringbuffer/backend_internal.h             |  23 +-
 lib/ringbuffer/backend_types.h                |  23 +-
 lib/ringbuffer/config.h                       |  23 +-
 lib/ringbuffer/frontend.h                     |  26 +-
 lib/ringbuffer/frontend_api.h                 |  26 +-
 lib/ringbuffer/frontend_internal.h            |  26 +-
 lib/ringbuffer/frontend_types.h               |  26 +-
 lib/ringbuffer/iterator.h                     |  26 +-
 lib/ringbuffer/nohz.h                         |  23 +-
 lib/ringbuffer/ring_buffer_backend.c          |  17 +-
 lib/ringbuffer/ring_buffer_frontend.c         |  18 +-
 lib/ringbuffer/ring_buffer_iterator.c         |  20 +-
 lib/ringbuffer/ring_buffer_mmap.c             |  18 +-
 lib/ringbuffer/ring_buffer_splice.c           |  19 +-
 lib/ringbuffer/ring_buffer_vfs.c              |  17 +-
 lib/ringbuffer/vatomic.h                      |  23 +-
 lib/ringbuffer/vfs.h                          |  26 +-
 lttng-abi-old.h                               |  23 +-
 lttng-abi.c                                   |  18 +-
 lttng-abi.h                                   |  23 +-
 lttng-calibrate.c                             |  17 +-
 lttng-clock.c                                 |  17 +-
 lttng-clock.h                                 |  23 +-
 lttng-context-callstack.c                     |  17 +-
 lttng-context-cpu-id.c                        |  17 +-
 lttng-context-hostname.c                      |  17 +-
 lttng-context-interruptible.c                 |  17 +-
 lttng-context-migratable.c                    |  17 +-
 lttng-context-need-reschedule.c               |  17 +-
 lttng-context-nice.c                          |  17 +-
 lttng-context-perf-counters.c                 |  17 +-
 lttng-context-pid.c                           |  17 +-
 lttng-context-ppid.c                          |  17 +-
 lttng-context-preemptible.c                   |  17 +-
 lttng-context-prio.c                          |  17 +-
 lttng-context-procname.c                      |  17 +-
 lttng-context-tid.c                           |  17 +-
 lttng-context-vpid.c                          |  17 +-
 lttng-context-vppid.c                         |  17 +-
 lttng-context-vtid.c                          |  17 +-
 lttng-context.c                               |  17 +-
 lttng-cpuhotplug.h                            |  23 +-
 lttng-endian.h                                |  15 +-
 lttng-events.c                                |  17 +-
 lttng-events.h                                |  23 +-
 lttng-filter-interpreter.c                    |  21 +-
 lttng-filter-specialize.c                     |  21 +-
 lttng-filter-validator.c                      |  21 +-
 lttng-filter.c                                |  21 +-
 lttng-filter.h                                |  27 +-
 lttng-kernel-version.h                        |  23 +-
 lttng-probes.c                                |  17 +-
 lttng-ring-buffer-client-discard.c            |  17 +-
 lttng-ring-buffer-client-mmap-discard.c       |  17 +-
 lttng-ring-buffer-client-mmap-overwrite.c     |  17 +-
 lttng-ring-buffer-client-overwrite.c          |  17 +-
 lttng-ring-buffer-client.h                    |  17 +-
 lttng-ring-buffer-metadata-client.c           |  17 +-
 lttng-ring-buffer-metadata-client.h           |  17 +-
 lttng-ring-buffer-metadata-mmap-client.c      |  17 +-
 lttng-statedump-impl.c                        |  17 +-
 lttng-string-utils.c                          |  17 +-
 lttng-string-utils.h                          |  15 +-
 lttng-syscalls.c                              |  17 +-
 lttng-tp-mempool.c                            |  17 +-
 lttng-tp-mempool.h                            |  23 +-
 lttng-tracepoint.c                            |  17 +-
 lttng-tracepoint.h                            |  23 +-
 lttng-tracer-core.h                           |  23 +-
 lttng-tracer.h                                |  15 +-
 lttng-tracker-pid.c                           |  17 +-
 mit-license.txt                               |  19 -
 probes/Kbuild                                 |   2 +
 probes/define_trace.h                         |  17 +-
 probes/lttng-events-nowrite.h                 |  17 +-
 probes/lttng-events-reset.h                   |  17 +-
 probes/lttng-events-write.h                   |  17 +-
 probes/lttng-ftrace.c                         |  17 +-
 probes/lttng-kprobes.c                        |  17 +-
 probes/lttng-kretprobes.c                     |  19 +-
 probes/lttng-probe-9p.c                       |   5 +-
 probes/lttng-probe-asoc.c                     |  17 +-
 probes/lttng-probe-block.c                    |  17 +-
 probes/lttng-probe-btrfs.c                    |  17 +-
 probes/lttng-probe-compaction.c               |  17 +-
 probes/lttng-probe-ext3.c                     |  17 +-
 probes/lttng-probe-ext4.c                     |  17 +-
 probes/lttng-probe-gpio.c                     |  17 +-
 probes/lttng-probe-i2c.c                      |  17 +-
 probes/lttng-probe-irq.c                      |  17 +-
 probes/lttng-probe-jbd.c                      |  17 +-
 probes/lttng-probe-jbd2.c                     |  17 +-
 probes/lttng-probe-kmem.c                     |  17 +-
 probes/lttng-probe-kvm-x86-mmu.c              |  17 +-
 probes/lttng-probe-kvm-x86.c                  |  17 +-
 probes/lttng-probe-kvm.c                      |  17 +-
 probes/lttng-probe-lock.c                     |  17 +-
 probes/lttng-probe-module.c                   |  17 +-
 probes/lttng-probe-napi.c                     |  17 +-
 probes/lttng-probe-net.c                      |  17 +-
 probes/lttng-probe-power.c                    |  17 +-
 probes/lttng-probe-preemptirq.c               |  17 +-
 probes/lttng-probe-printk.c                   |  17 +-
 probes/lttng-probe-random.c                   |  17 +-
 probes/lttng-probe-rcu.c                      |  17 +-
 probes/lttng-probe-regmap.c                   |  17 +-
 probes/lttng-probe-regulator.c                |  17 +-
 probes/lttng-probe-rpm.c                      |  17 +-
 probes/lttng-probe-sched.c                    |  17 +-
 probes/lttng-probe-scsi.c                     |  17 +-
 probes/lttng-probe-signal.c                   |  17 +-
 probes/lttng-probe-skb.c                      |  17 +-
 probes/lttng-probe-sock.c                     |  17 +-
 probes/lttng-probe-statedump.c                |  17 +-
 probes/lttng-probe-sunrpc.c                   |  17 +-
 probes/lttng-probe-timer.c                    |  17 +-
 probes/lttng-probe-udp.c                      |  17 +-
 probes/lttng-probe-user.c                     |  17 +-
 probes/lttng-probe-user.h                     |  23 +-
 probes/lttng-probe-v4l2.c                     |  17 +-
 probes/lttng-probe-vmscan.c                   |  17 +-
 probes/lttng-probe-workqueue.c                |  17 +-
 probes/lttng-probe-writeback.c                |  17 +-
 probes/lttng-probe-x86-exceptions.c           |  17 +-
 probes/lttng-probe-x86-irq-vectors.c          |  17 +-
 probes/lttng-tracepoint-event-impl.h          |  17 +-
 probes/lttng-tracepoint-event.h               |  23 +-
 probes/lttng-types.h                          |  31 +-
 probes/lttng.c                                |  17 +-
 probes/lttng.h                                |  23 +-
 tests/Kbuild                                  |   2 +
 tests/Kconfig                                 |   2 +
 tests/clock-plugin/lttng-clock-plugin-test.c  |  17 +-
 tests/probes/lttng-test.c                     |  17 +-
 wrapper/atomic.h                              |  23 +-
 wrapper/compiler.h                            |  23 +-
 wrapper/fdtable.c                             |  16 +-
 wrapper/fdtable.h                             |  23 +-
 wrapper/file.h                                |  23 +-
 wrapper/frame.h                               |  23 +-
 wrapper/ftrace.h                              |  23 +-
 wrapper/genhd.h                               |  23 +-
 wrapper/inline_memcpy.h                       |  17 +-
 wrapper/irq.h                                 |  23 +-
 wrapper/irqdesc.c                             |  17 +-
 wrapper/irqdesc.h                             |  23 +-
 wrapper/irqflags.h                            |  23 +-
 wrapper/kallsyms.h                            |  23 +-
 wrapper/kref.h                                |  22 +-
 wrapper/kstrtox.h                             |  23 +-
 wrapper/list.h                                |  22 +-
 wrapper/page_alloc.c                          |  16 +-
 wrapper/page_alloc.h                          |  23 +-
 wrapper/percpu-defs.h                         |  23 +-
 wrapper/perf.h                                |  23 +-
 wrapper/poll.h                                |  23 +-
 wrapper/random.c                              |  17 +-
 wrapper/random.h                              |  23 +-
 wrapper/rcu.h                                 |  23 +-
 wrapper/ringbuffer/api.h                      |   1 +
 wrapper/ringbuffer/backend.h                  |   1 +
 wrapper/ringbuffer/backend_internal.h         |   1 +
 wrapper/ringbuffer/backend_types.h            |   1 +
 wrapper/ringbuffer/config.h                   |   1 +
 wrapper/ringbuffer/frontend.h                 |   1 +
 wrapper/ringbuffer/frontend_api.h             |   1 +
 wrapper/ringbuffer/frontend_internal.h        |   1 +
 wrapper/ringbuffer/frontend_types.h           |   1 +
 wrapper/ringbuffer/iterator.h                 |   1 +
 wrapper/ringbuffer/nohz.h                     |   1 +
 wrapper/ringbuffer/vatomic.h                  |   1 +
 wrapper/ringbuffer/vfs.h                      |   1 +
 wrapper/spinlock.h                            |  23 +-
 wrapper/splice.c                              |  17 +-
 wrapper/splice.h                              |  23 +-
 wrapper/time.h                                |  23 +-
 wrapper/timer.h                               |  23 +-
 wrapper/trace-clock.c                         |  17 +-
 wrapper/trace-clock.h                         |  23 +-
 wrapper/tracepoint.h                          |  23 +-
 wrapper/types.h                               |  23 +-
 wrapper/uuid.h                                |  23 +-
 wrapper/vmalloc.h                             |  23 +-
 wrapper/vzalloc.h                             |  23 +-
 wrapper/writeback.h                           |  23 +-
 248 files changed, 1188 insertions(+), 3440 deletions(-)
 rename gpl-2.0.txt => LICENSES/GPL-2.0 (93%)
 create mode 100644 LICENSES/LGPL-2.1
 create mode 100644 LICENSES/MIT
 delete mode 100644 lgpl-2.1.txt
 delete mode 100644 mit-license.txt
Kconfig +2 -0
index 5eb2576..acdab73 100644
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+
 config LTTNG
 	tristate "LTTng support"
 	select TRACEPOINTS
LICENSE +7 -8
index badff65..9b8e8b3 100644
@@ -2,26 +2,25 @@ LTTng modules licensing
 Mathieu Desnoyers
 June 2, 2011
 
-* LGPLv2.1/GPLv2 dual-license
+* LGPL-2.1 / GPL-2.0 dual-license
 
 The files contained within this package are licensed under
-LGPLv2.1/GPLv2 dual-license (see lgpl-2.1.txt and gpl-2.0.txt for
+LGPL-2.1 / GPL-2.0 dual-license (see LICENSES/LGPL-2.1 and LICENSES/GPL-2.0 for
 details), except for files identified by the following sections.
 
-* GPLv2 license
+* GPL-2.0 license
 
-These files are licensed exclusively under the GPLv2 license. See
-gpl-2.0.txt for details.
+These files are licensed exclusively under the GPL-2.0 license. See
+LICENSES/GPL-2.0 for details.
 
 lib/ringbuffer/ring_buffer_splice.c
 lib/ringbuffer/ring_buffer_mmap.c
-instrumentation/events/mainline/*.h
-instrumentation/events/lttng-modules/*.h
+instrumentation/events/lttng-module/*.h
 wrapper/list.h
 
 * MIT-style license
 
-These files are licensed under an MIT-style license. See mit-license.txt
+These files are licensed under an MIT-style license. See LICENSES/MIT
 for details.
 
 lib/prio_heap/lttng_prio_heap.h
LICENSES/GPL-2.0 renamed from gpl-2.0.txt +32 -12

96 lines not on this page · raw message

LICENSES/LGPL-2.1 new file +503 -0

503 lines not on this page · raw message

LICENSES/MIT new file +30 -0
new file mode 100644
index 0000000..f33a68c
@@ -0,0 +1,30 @@
+Valid-License-Identifier: MIT
+SPDX-URL: https://spdx.org/licenses/MIT.html
+Usage-Guide:
+  To use the MIT License put the following SPDX tag/value pair into a
+  comment according to the placement guidelines in the licensing rules
+  documentation:
+    SPDX-License-Identifier: MIT
+License-Text:
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
Makefile +1 -3
index 42b7a99..ae2b195 100644
@@ -1,6 +1,4 @@
-#
-# Makefile for the LTT objects.
-#
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
 
 ifneq ($(KERNELRELEASE),)
 
filter-bytecode.h +5 -22
index bd83d08..65d34f0 100644
@@ -1,32 +1,15 @@
-#ifndef _FILTER_BYTECODE_H
-#define _FILTER_BYTECODE_H
-
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * filter-bytecode.h
  *
  * LTTng filter bytecode
  *
  * Copyright 2012-2016 - Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef _FILTER_BYTECODE_H
+#define _FILTER_BYTECODE_H
+
 /*
  * offsets are absolute from start of bytecode.
  */
instrumentation/events/lttng-module/9p.h +1 -1
index ab58bac..bc6e01a 100644
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1) */
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM 9p
 
instrumentation/events/lttng-module/arch/x86/exceptions.h +1 -0
index a4546cc..ac86a58 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_EXCEPTIONS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_EXCEPTIONS_H
 
instrumentation/events/lttng-module/arch/x86/irq_vectors.h +1 -0
index c522aa7..d9f92ec 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_IRQ_VECTORS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_IRQ_VECTORS_H
 
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +1 -0
index e3f7abd..39ec6a9 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_KVM_MMU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MMU_H
 
instrumentation/events/lttng-module/arch/x86/kvm/trace.h +1 -0
index 4d8e763..57ac7f4 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_H
 
instrumentation/events/lttng-module/asoc.h +1 -0
index 4c5833c..0069e2c 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM asoc
 
instrumentation/events/lttng-module/block.h +1 -0
index 910217b..0dab931 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM block
 
instrumentation/events/lttng-module/btrfs.h +1 -0
index 7c17de6..3bf8304 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM btrfs
 
instrumentation/events/lttng-module/compaction.h +1 -0
index f4f2341..c6db6d0 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM compaction
 
instrumentation/events/lttng-module/ext3.h +1 -0
index 4e45761..8c0115a 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ext3
 
instrumentation/events/lttng-module/ext4.h +1 -0
index fe6f802..740f288 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ext4
 
instrumentation/events/lttng-module/gpio.h +1 -0
index 317c0f6..bb492e7 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM gpio
 
instrumentation/events/lttng-module/i2c.h +1 -0
index dd91c9b..dcbabf6 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM i2c
 
instrumentation/events/lttng-module/irq.h +1 -0
index 502b08e..6f66a5e 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
instrumentation/events/lttng-module/jbd.h +1 -0
index b3c9a7a..acc8a48 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd
 
instrumentation/events/lttng-module/jbd2.h +1 -0
index 3ba7962..10e3073 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd2
 
instrumentation/events/lttng-module/kmem.h +1 -0
index c3fa25a..8270fce 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kmem
 
instrumentation/events/lttng-module/kvm.h +1 -0
index 9bb08c5..5f14ba1 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(LTTNG_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MAIN_H
 
instrumentation/events/lttng-module/lock.h +1 -0
index ff7f7ee..49e7811 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/version.h>
 
 #undef TRACE_SYSTEM
instrumentation/events/lttng-module/lttng-statedump.h +1 -0
index e7c528d..3bfc28e 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lttng_statedump
 
instrumentation/events/lttng-module/lttng-test.h +1 -0
index 676bdd1..9f0cffb 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lttng_test
 
instrumentation/events/lttng-module/lttng.h +1 -0
index 9f7eadf..4b021e2 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lttng
 
instrumentation/events/lttng-module/mm_vmscan.h +1 -0
index 9a77ead..b9cd8b0 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mm_vmscan
 
instrumentation/events/lttng-module/module.h +1 -0
index f7b6056..febe8d2 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Because linux/module.h has tracepoints in the header, and ftrace.h
  * eventually includes this file, define_trace.h includes linux/module.h
instrumentation/events/lttng-module/napi.h +1 -0
index 7b5ecfc..57fd6ee 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM napi
 
instrumentation/events/lttng-module/net.h +1 -0
index 2085def..8789263 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM net
 
instrumentation/events/lttng-module/power.h +1 -0
index 235991a..2146a37 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM power
 
instrumentation/events/lttng-module/preemptirq.h +1 -0
index ec4570c..4f9be85 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_PREEMPTIRQ_EVENTS
 
 #undef TRACE_SYSTEM
instrumentation/events/lttng-module/printk.h +1 -0
index 077fc45..1d5ea36 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM printk
 
instrumentation/events/lttng-module/random.h +1 -0
index ce6c760..f165600 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random
 
instrumentation/events/lttng-module/rcu.h +1 -0
index 58a2306..aa97079 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rcu
 
instrumentation/events/lttng-module/regmap.h +1 -0
index cc42dcb..badfd32 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regmap
 
instrumentation/events/lttng-module/regulator.h +1 -0
index d1fc51f..3d2616c 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regulator
 
instrumentation/events/lttng-module/rpc.h +1 -0
index b9e45fe..c825f8b 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rpc
 
instrumentation/events/lttng-module/rpm.h +1 -1
index 24b7944..5fcc456 100644
@@ -1,4 +1,4 @@
-
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rpm
 
instrumentation/events/lttng-module/sched.h +1 -0
index f5c3669..550ce2f 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sched
 
instrumentation/events/lttng-module/scsi.h +1 -0
index adc7491..97ee050 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM scsi
 
instrumentation/events/lttng-module/signal.h +1 -0
index b3c9126..68045ce 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM signal
 
instrumentation/events/lttng-module/skb.h +1 -0
index 77e1823..6d3fd45 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb
 
instrumentation/events/lttng-module/sock.h +1 -0
index 5cd02ca..4bde039 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sock
 
instrumentation/events/lttng-module/timer.h +1 -0
index 6f0cb7f..a007fd2 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM timer
 
instrumentation/events/lttng-module/udp.h +1 -0
index 9cc6afa..84a2e99 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM udp
 
instrumentation/events/lttng-module/v4l2.h +1 -0
index ac6d636..3766985 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM v4l2
 
instrumentation/events/lttng-module/workqueue.h +1 -0
index 759a783..07d6a53 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM workqueue
 
instrumentation/events/lttng-module/writeback.h +1 -0
index c472b33..3327a0f 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM writeback
 
instrumentation/syscalls/lttng-syscalls-extractor/Kbuild +2 -0
index 55ff529..079aab3 100644
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+
 obj-m += lttng-syscalls-extractor.o
 
 # vim:syntax=make
instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c +2 -15
index 7119746..e88bb5d 100644
@@ -1,24 +1,11 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-syscalls-extractor.c
  *
  * Dump syscall metadata to console.
  *
  * Copyright 2011 - Mathieu Desnoyers <[email protected]>
  * Copyright 2011 - Julien Desfossez <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <linux/module.h>
lgpl-2.1.txt deleted +0 -504

504 lines not on this page · raw message

lib/Kbuild +2 -0
index 5248d37..13b51f9 100644
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+
 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
 include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
lib/align.h +5 -18
index 5b91ae8..94acacf 100644
@@ -1,26 +1,13 @@
-#ifndef _LTTNG_ALIGN_H
-#define _LTTNG_ALIGN_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lib/align.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_ALIGN_H
+#define _LTTNG_ALIGN_H
+
 #ifdef __KERNEL__
 
 #include <linux/types.h>
lib/bitfield.h +5 -22
index a3927a5..a729db9 100644
@@ -1,32 +1,15 @@
-#ifndef _BABELTRACE_BITFIELD_H
-#define _BABELTRACE_BITFIELD_H
-
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * BabelTrace
  *
  * Bitfields read/write functions.
  *
  * Copyright 2010 - Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef _BABELTRACE_BITFIELD_H
+#define _BABELTRACE_BITFIELD_H
+
 #include <lttng-endian.h>
 
 #ifndef CHAR_BIT
lib/bug.h +5 -18
index 3de40ca..8ddf2b0 100644
@@ -1,26 +1,13 @@
-#ifndef _LTTNG_BUG_H
-#define _LTTNG_BUG_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lib/bug.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_BUG_H
+#define _LTTNG_BUG_H
+
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
lib/prio_heap/lttng_prio_heap.c +2 -19
index 01ed69f..04438bb 100644
@@ -1,27 +1,10 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng_prio_heap.c
  *
  * Priority heap containing pointers. Based on CLRS, chapter 6.
  *
  * Copyright 2011 - Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #include <linux/slab.h>
lib/prio_heap/lttng_prio_heap.h +5 -22
index 6d58455..f97f33f 100644
@@ -1,32 +1,15 @@
-#ifndef _LTTNG_PRIO_HEAP_H
-#define _LTTNG_PRIO_HEAP_H
-
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng_prio_heap.h
  *
  * Priority heap containing pointers. Based on CLRS, chapter 6.
  *
  * Copyright 2011 - Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef _LTTNG_PRIO_HEAP_H
+#define _LTTNG_PRIO_HEAP_H
+
 #include <linux/gfp.h>
 
 struct lttng_ptr_heap {
lib/ringbuffer/api.h +5 -18
index 4383b14..c1b6379 100644
@@ -1,28 +1,15 @@
-#ifndef _LIB_RING_BUFFER_API_H
-#define _LIB_RING_BUFFER_API_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/api.h
  *
  * Ring Buffer API.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_API_H
+#define _LIB_RING_BUFFER_API_H
+
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/ringbuffer/vfs.h>
lib/ringbuffer/backend.h +5 -18
index 0b75de8..501fad4 100644
@@ -1,31 +1,18 @@
-#ifndef _LIB_RING_BUFFER_BACKEND_H
-#define _LIB_RING_BUFFER_BACKEND_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/backend.h
  *
  * Ring buffer backend (API).
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
  * Credits to Steven Rostedt for proposing to use an extra-subbuffer owned by
  * the reader in flight recorder mode.
  */
 
+#ifndef _LIB_RING_BUFFER_BACKEND_H
+#define _LIB_RING_BUFFER_BACKEND_H
+
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
lib/ringbuffer/backend_internal.h +5 -18
index dc69ecf..2d6a345 100644
@@ -1,28 +1,15 @@
-#ifndef _LIB_RING_BUFFER_BACKEND_INTERNAL_H
-#define _LIB_RING_BUFFER_BACKEND_INTERNAL_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/backend_internal.h
  *
  * Ring buffer backend (internal helpers).
  *
  * Copyright (C) 2008-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_BACKEND_INTERNAL_H
+#define _LIB_RING_BUFFER_BACKEND_INTERNAL_H
+
 #include <wrapper/compiler.h>
 #include <wrapper/ringbuffer/config.h>
 #include <wrapper/ringbuffer/backend_types.h>
lib/ringbuffer/backend_types.h +5 -18
index 01ed63b..c443b64 100644
@@ -1,28 +1,15 @@
-#ifndef _LIB_RING_BUFFER_BACKEND_TYPES_H
-#define _LIB_RING_BUFFER_BACKEND_TYPES_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/backend_types.h
  *
  * Ring buffer backend (types).
  *
  * Copyright (C) 2008-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_BACKEND_TYPES_H
+#define _LIB_RING_BUFFER_BACKEND_TYPES_H
+
 #include <linux/cpumask.h>
 #include <linux/types.h>
 #include <lttng-kernel-version.h>
lib/ringbuffer/config.h +5 -18
index 0598519..d48654b 100644
@@ -1,29 +1,16 @@
-#ifndef _LIB_RING_BUFFER_CONFIG_H
-#define _LIB_RING_BUFFER_CONFIG_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/config.h
  *
  * Ring buffer configuration header. Note: after declaring the standard inline
  * functions, clients should also include linux/ringbuffer/api.h.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_CONFIG_H
+#define _LIB_RING_BUFFER_CONFIG_H
+
 #include <linux/types.h>
 #include <linux/percpu.h>
 #include <lib/align.h>
lib/ringbuffer/frontend.h +5 -21
index ba96d9a..6f516d9 100644
@@ -1,33 +1,17 @@
-#ifndef _LIB_RING_BUFFER_FRONTEND_H
-#define _LIB_RING_BUFFER_FRONTEND_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/frontend.h
  *
  * Ring Buffer Library Synchronization Header (API).
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
- *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
+#ifndef _LIB_RING_BUFFER_FRONTEND_H
+#define _LIB_RING_BUFFER_FRONTEND_H
+
 #include <linux/pipe_fs_i.h>
 #include <linux/rcupdate.h>
 #include <linux/cpumask.h>
lib/ringbuffer/frontend_api.h +5 -21
index b4a8db8..21e53ea 100644
@@ -1,34 +1,18 @@
-#ifndef _LIB_RING_BUFFER_FRONTEND_API_H
-#define _LIB_RING_BUFFER_FRONTEND_API_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/frontend_api.h
  *
  * Ring Buffer Library Synchronization Header (buffer write API).
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
- *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  * See linux/ringbuffer/frontend.h for channel allocation and read-side API.
  */
 
+#ifndef _LIB_RING_BUFFER_FRONTEND_API_H
+#define _LIB_RING_BUFFER_FRONTEND_API_H
+
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/percpu-defs.h>
 #include <linux/errno.h>
lib/ringbuffer/frontend_internal.h +5 -21
index 26bd7c2..d02a73d 100644
@@ -1,33 +1,17 @@
-#ifndef _LIB_RING_BUFFER_FRONTEND_INTERNAL_H
-#define _LIB_RING_BUFFER_FRONTEND_INTERNAL_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * linux/ringbuffer/frontend_internal.h
  *
  * Ring Buffer Library Synchronization Header (internal helpers).
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
- *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
+#ifndef _LIB_RING_BUFFER_FRONTEND_INTERNAL_H
+#define _LIB_RING_BUFFER_FRONTEND_INTERNAL_H
+
 #include <wrapper/ringbuffer/config.h>
 #include <wrapper/ringbuffer/backend_types.h>
 #include <wrapper/ringbuffer/frontend_types.h>
lib/ringbuffer/frontend_types.h +5 -21
index 50b33ac..2b0c932 100644
@@ -1,33 +1,17 @@
-#ifndef _LIB_RING_BUFFER_FRONTEND_TYPES_H
-#define _LIB_RING_BUFFER_FRONTEND_TYPES_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/frontend_types.h
  *
  * Ring Buffer Library Synchronization Header (types).
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
- *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
+#ifndef _LIB_RING_BUFFER_FRONTEND_TYPES_H
+#define _LIB_RING_BUFFER_FRONTEND_TYPES_H
+
 #include <linux/kref.h>
 #include <wrapper/ringbuffer/config.h>
 #include <wrapper/ringbuffer/backend_types.h>
lib/ringbuffer/iterator.h +5 -21
index 6ed5b3b..6c59360 100644
@@ -1,31 +1,15 @@
-#ifndef _LIB_RING_BUFFER_ITERATOR_H
-#define _LIB_RING_BUFFER_ITERATOR_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/iterator.h
  *
  * Ring buffer and channel iterators.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
  */
 
+#ifndef _LIB_RING_BUFFER_ITERATOR_H
+#define _LIB_RING_BUFFER_ITERATOR_H
+
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/ringbuffer/vfs.h>
lib/ringbuffer/nohz.h +5 -18
index a645764..6a7d224 100644
@@ -1,26 +1,13 @@
-#ifndef _LIB_RING_BUFFER_NOHZ_H
-#define _LIB_RING_BUFFER_NOHZ_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/nohz.h
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_NOHZ_H
+#define _LIB_RING_BUFFER_NOHZ_H
+
 #ifdef CONFIG_LIB_RING_BUFFER
 void lib_ring_buffer_tick_nohz_flush(void);
 void lib_ring_buffer_tick_nohz_stop(void);
lib/ringbuffer/ring_buffer_backend.c +2 -15
index 3efa1d1..54c62a9 100644
@@ -1,21 +1,8 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * ring_buffer_backend.c
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/stddef.h>
lib/ringbuffer/ring_buffer_frontend.c +2 -16
index 0d8279b..52afa8b 100644
@@ -1,23 +1,9 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * ring_buffer_frontend.c
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- *
  * Ring buffer wait-free buffer synchronization. Producer-consumer and flight
  * recorder (overwrite) modes. See thesis:
  *
lib/ringbuffer/ring_buffer_iterator.c +2 -18
index 61eaa5b..9efe491 100644
@@ -1,4 +1,5 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * ring_buffer_iterator.c
  *
  * Ring buffer and channel iterators. Get each event of a channel in order. Uses
@@ -6,23 +7,6 @@
  * complexity for the "get next event" operation.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
  */
 
 #include <wrapper/ringbuffer/iterator.h>
lib/ringbuffer/ring_buffer_mmap.c +3 -15
index 4b1b7b3..30dd93e 100644
@@ -1,24 +1,12 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * ring_buffer_mmap.c
  *
  * Copyright (C) 2002-2005 - Tom Zanussi <[email protected]>, IBM Corp
  * Copyright (C) 1999-2005 - Karim Yaghmour <[email protected]>
  * Copyright (C) 2008-2012 - Mathieu Desnoyers <[email protected]>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; only version 2 of the License.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Re-using code from kernel/relay.c, hence the GPLv2 license for this
+ * Re-using code from kernel/relay.c, hence the GPL-2.0 license for this
  * file.
  */
 
lib/ringbuffer/ring_buffer_splice.c +3 -16
index 8d14666..468641b 100644
@@ -1,26 +1,13 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * ring_buffer_splice.c
  *
  * Copyright (C) 2002-2005 - Tom Zanussi <[email protected]>, IBM Corp
  * Copyright (C) 1999-2005 - Karim Yaghmour <[email protected]>
  * Copyright (C) 2008-2012 - Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
  * Re-using code from kernel/relay.c, which is why it is licensed under
- * the GPLv2.
+ * the GPL-2.0.
  */
 
 #include <linux/module.h>
lib/ringbuffer/ring_buffer_vfs.c +2 -15
index a69d374..f6c0e3d 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * ring_buffer_vfs.c
  *
  * Ring Buffer VFS file operations.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lib/ringbuffer/vatomic.h +5 -18
index 1a3eaaa..4f93f7d 100644
@@ -1,26 +1,13 @@
-#ifndef _LIB_RING_BUFFER_VATOMIC_H
-#define _LIB_RING_BUFFER_VATOMIC_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/vatomic.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LIB_RING_BUFFER_VATOMIC_H
+#define _LIB_RING_BUFFER_VATOMIC_H
+
 #include <asm/atomic.h>
 #include <asm/local.h>
 
lib/ringbuffer/vfs.h +5 -21
index e2bc401..b30b0f5 100644
@@ -1,31 +1,15 @@
-#ifndef _LIB_RING_BUFFER_VFS_H
-#define _LIB_RING_BUFFER_VFS_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
  * lib/ringbuffer/vfs.h
  *
  * Wait-free ring buffer VFS file operations.
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
- *
- * Author:
- *	Mathieu Desnoyers <[email protected]>
  */
 
+#ifndef _LIB_RING_BUFFER_VFS_H
+#define _LIB_RING_BUFFER_VFS_H
+
 #include <linux/fs.h>
 #include <linux/poll.h>
 
lttng-abi-old.h +5 -18
index 5a48863..07b3fe7 100644
@@ -1,28 +1,15 @@
-#ifndef _LTTNG_ABI_OLD_H
-#define _LTTNG_ABI_OLD_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-abi-old.h
  *
  * LTTng old ABI header (without support for compat 32/64 bits)
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_ABI_OLD_H
+#define _LTTNG_ABI_OLD_H
+
 #include <linux/fs.h>
 #include <lttng-abi.h>
 
lttng-abi.c +2 -16
index f155c76..c535cb9 100644
@@ -1,25 +1,11 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-abi.c
  *
  * LTTng ABI
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
  *
- * 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
- *
- *
  * Mimic system calls for:
  * - session creation, returns a file descriptor or failure.
  *   - channel creation, returns a file descriptor or failure.
lttng-abi.h +5 -18
index c8c4e29..f0fe8ef 100644
@@ -1,28 +1,15 @@
-#ifndef _LTTNG_ABI_H
-#define _LTTNG_ABI_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-abi.h
  *
  * LTTng ABI header
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_ABI_H
+#define _LTTNG_ABI_H
+
 #include <linux/fs.h>
 
 /*
lttng-calibrate.c +2 -15
index 55cb1c4..5394c24 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-calibrate.c
  *
  * LTTng probe calibration.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <lttng-abi.h>
lttng-clock.c +2 -15
index 48b4be5..6872294 100644
@@ -1,21 +1,8 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-clock.c
  *
  * Copyright (C) 2014 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-clock.h +5 -18
index 5da4f0c..2949456 100644
@@ -1,26 +1,13 @@
-#ifndef _LTTNG_CLOCK_H
-#define _LTTNG_CLOCK_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-clock.h
  *
  * Copyright (C) 2014 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_CLOCK_H
+#define _LTTNG_CLOCK_H
+
 #include <linux/module.h>
 
 #define LTTNG_MODULES_UUID_STR_LEN	37
lttng-context-callstack.c +2 -15
index 0718114..0876b12 100644
@@ -1,4 +1,5 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-callstack.c
  *
  * LTTng callstack event context.
@@ -6,20 +7,6 @@
  * Copyright (C) 2014 Mathieu Desnoyers <[email protected]>
  * Copyright (C) 2014 Francis Giraldeau <[email protected]>
  *
- * 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
- *
  * The callstack context can be added to any kernel event. It records
  * either the kernel or the userspace callstack, up to a max depth. The
  * context is a CTF sequence, such that it uses only the space required
lttng-context-cpu-id.c +2 -15
index f2bab8f..3778225 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-cpu-id.c
  *
  * LTTng CPU id context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-hostname.c +2 -15
index 791fed4..e485aa9 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-hostname.c
  *
  * LTTng hostname context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-interruptible.c +2 -15
index 8966fa9..f3da199 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-interruptible.c
  *
  * LTTng interruptible context.
  *
  * Copyright (C) 2009-2015 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-migratable.c +2 -15
index 4aefce6..bb44c65 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-migratable.c
  *
  * LTTng migratable context.
  *
  * Copyright (C) 2009-2015 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-need-reschedule.c +2 -15
index 987d917..f29fb28 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-need-reschedule.c
  *
  * LTTng need_reschedule context.
  *
  * Copyright (C) 2009-2015 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-nice.c +2 -15
index a8823c4..563e805 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-nice.c
  *
  * LTTng nice context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-perf-counters.c +2 -15
index 260e5d0..43c4077 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-perf-counters.c
  *
  * LTTng performance monitoring counters (perf-counters) integration module.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-pid.c +2 -15
index 4cff307..b3caabb 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-pid.c
  *
  * LTTng PID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-ppid.c +2 -15
index 8b7c8ed..ef84ad1 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-ppid.c
  *
  * LTTng PPID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-preemptible.c +2 -15
index c842104..328f2a4 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-preemptible.c
  *
  * LTTng preemptible context.
  *
  * Copyright (C) 2009-2015 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-prio.c +2 -15
index 8a0839c..b5d21e7 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-prio.c
  *
  * LTTng priority context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-procname.c +2 -15
index f0b9d97..54007d1 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-procname.c
  *
  * LTTng procname context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-tid.c +2 -15
index 913c6d5..d2a20e6 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-tid.c
  *
  * LTTng TID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-vpid.c +2 -15
index 4823665..982ce55 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-vpid.c
  *
  * LTTng vPID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-vppid.c +2 -15
index cb5c050..66d6382 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-vppid.c
  *
  * LTTng vPPID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context-vtid.c +2 -15
index ddc29e6..8fd68a8 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context-vtid.c
  *
  * LTTng vTID context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-context.c +2 -15
index bed3d1c..869496d 100644
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-context.c
  *
  * LTTng trace/channel/event context management.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #include <linux/module.h>
lttng-cpuhotplug.h +5 -18
index 76a7cb8..f261d04 100644
@@ -1,26 +1,13 @@
-#ifndef LTTNG_CPUHOTPLUG_H
-#define LTTNG_CPUHOTPLUG_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-cpuhotplug.h
  *
  * Copyright (C) 2016 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef LTTNG_CPUHOTPLUG_H
+#define LTTNG_CPUHOTPLUG_H
+
 struct lttng_cpuhp_node;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
lttng-endian.h +1 -14
index f88d974..5d525c3 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) */
 #ifndef _LTTNG_ENDIAN_H
 #define _LTTNG_ENDIAN_H
 
@@ -5,20 +6,6 @@
  * lttng-endian.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
 #ifdef __KERNEL__
lttng-events.c +2 -15
index de9e219..48e1760 100644
@@ -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 <[email protected]>
- *
- * 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
  */
 
 /*
lttng-events.h +5 -18
index 2b13705..8b0803e 100644
@@ -1,28 +1,15 @@
-#ifndef _LTTNG_EVENTS_H
-#define _LTTNG_EVENTS_H
-
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-events.h
  *
  * Holds LTTng per-session event registry.
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <[email protected]>
- *
- * 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
  */
 
+#ifndef _LTTNG_EVENTS_H
+#define _LTTNG_EVENTS_H
+
 #include <linux/version.h>
 #include <linux/list.h>
 #include <linux/kprobes.h>
lttng-filter-interpreter.c +2 -19
index 637dd68..bf69549 100644
@@ -1,27 +1,10 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng-filter-interpreter.c
  *
  * LTTng modules filter interpreter.
  *
  * Copyright (C) 2010-2016 Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #include <linux/uaccess.h>
lttng-filter-specialize.c +2 -19
index c0c3e11..4f9a0cd 100644
@@ -1,27 +1,10 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng-filter-specialize.c
  *
  * LTTng modules filter code specializer.
  *
  * Copyright (C) 2010-2016 Mathieu Desnoyers <[email protected]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

lttng-filter-validator.c +2 -19
index a4ca777..c479af0 100644

Lines of this file are not shown. View the raw message.

lttng-filter.c +2 -19
index 86c21ee..325ae7b 100644

Lines of this file are not shown. View the raw message.

lttng-filter.h +5 -22
index 3fba528..fec2db1 100644

Lines of this file are not shown. View the raw message.

lttng-kernel-version.h +5 -18
index 2b63a5d..6b545db 100644

Lines of this file are not shown. View the raw message.

lttng-probes.c +2 -15
index 51b0f86..f95391f 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-client-discard.c +2 -15
index bb7e58a..d544146 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-client-mmap-discard.c +2 -15
index f345ed4..67483df 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-client-mmap-overwrite.c +2 -15
index cfc783f..95b58d0 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-client-overwrite.c +2 -15
index 49acc1d..6623aff 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-client.h +2 -15
index 4700ae5..dc3356e 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-metadata-client.c +2 -15
index efbf4c9..66c4e71 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-metadata-client.h +2 -15
index bd27dd7..17ffd75 100644

Lines of this file are not shown. View the raw message.

lttng-ring-buffer-metadata-mmap-client.c +2 -15
index 5f648a8..0f751dd 100644

Lines of this file are not shown. View the raw message.

lttng-statedump-impl.c +2 -15
index 37a4542..ecec4f0 100644

Lines of this file are not shown. View the raw message.

lttng-string-utils.c +2 -15
index 7485380..7b3504b 100644

Lines of this file are not shown. View the raw message.

lttng-string-utils.h +1 -14
index 1a19376..0f8ba79 100644

Lines of this file are not shown. View the raw message.

lttng-syscalls.c +2 -15
index 0b980a1..bcc06b5 100644

Lines of this file are not shown. View the raw message.

lttng-tp-mempool.c +2 -15
index b3dc50e..9db6046 100644

Lines of this file are not shown. View the raw message.

lttng-tp-mempool.h +5 -18
index 7ce4112..b5d3ec1 100644

Lines of this file are not shown. View the raw message.

lttng-tracepoint.c +2 -15
index 7a50dd2..ec77e7c 100644

Lines of this file are not shown. View the raw message.

lttng-tracepoint.h +5 -18
index e4f815d..516a03a 100644

Lines of this file are not shown. View the raw message.

lttng-tracer-core.h +5 -18
index 2db349a..a7b1e0a 100644

Lines of this file are not shown. View the raw message.

lttng-tracer.h +1 -14
index 5e9f88a..1ba6f12 100644

Lines of this file are not shown. View the raw message.

lttng-tracker-pid.c +2 -15
index d74d8c9..747aec2 100644

Lines of this file are not shown. View the raw message.

mit-license.txt deleted +0 -19
deleted file mode 100644
index 5f26899..0000000

Lines of this file are not shown. View the raw message.

probes/Kbuild +2 -0
index 7a0b650..eb6ded9 100644

Lines of this file are not shown. View the raw message.

probes/define_trace.h +2 -15
index 56034f0..497f11f 100644

Lines of this file are not shown. View the raw message.

probes/lttng-events-nowrite.h +2 -15
index 62e3239..ea06556 100644

Lines of this file are not shown. View the raw message.

probes/lttng-events-reset.h +2 -15
index c586b8f..a13d1cc 100644

Lines of this file are not shown. View the raw message.

probes/lttng-events-write.h +2 -15
index aa505f6..c645c5e 100644

Lines of this file are not shown. View the raw message.

probes/lttng-ftrace.c +2 -15
index 03d9d3b..fe1bfd6 100644

Lines of this file are not shown. View the raw message.

probes/lttng-kprobes.c +2 -15
index 32f43bd..131333b 100644

Lines of this file are not shown. View the raw message.

probes/lttng-kretprobes.c +3 -16
index d25862b..84eca9b 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-9p.c +2 -3
index 25dba4f..1a6895e 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-asoc.c +2 -15
index 98c683a..4d07079 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-block.c +2 -15
index 827ead2..d76dfdf 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-btrfs.c +2 -15
index 89fa351..b531197 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-compaction.c +2 -15
index 939ca9d..2835c8c 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-ext3.c +2 -15
index 00518be..22d4f25 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-ext4.c +2 -15
index 470192c..e3e9ae1 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-gpio.c +2 -15
index f08b897..092d95a 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-i2c.c +2 -15
index d1c1e09..728132b 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-irq.c +2 -15
index 3483e0f..af78e75 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-jbd.c +2 -15
index d632ca1..fc0be22 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-jbd2.c +2 -15
index 44a9b9a..1de6653 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-kmem.c +2 -15
index bfde829..d1cc60c 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-kvm-x86-mmu.c +2 -15
index ca5444a..37384a2 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-kvm-x86.c +2 -15
index fa3f9dc..f081cdd 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-kvm.c +2 -15
index 66e90fb..5e47101 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-lock.c +2 -15
index 4e59da8..b3ad230 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-module.c +2 -15
index a042425..03e97f7 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-napi.c +2 -15
index 765878f..412080a 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-net.c +2 -15
index 6187663..01c0026 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-power.c +2 -15
index 00a49a0..17eda44 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-preemptirq.c +2 -15
index 1270771..9115503 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-printk.c +2 -15
index 6c02531..46de679 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-random.c +2 -15
index ebcd431..a2d0a29 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-rcu.c +2 -15
index 84d5bed..11a6d0c 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-regmap.c +2 -15
index 88a4b8b..1d5eefa 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-regulator.c +2 -15
index 4e39303..bd2ab3f 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-rpm.c +2 -15
index 687a542..4303965 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-sched.c +2 -15
index 62156eb..bb1e12d 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-scsi.c +2 -15
index 7c66994..a100f0a 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-signal.c +2 -15
index e11b13c..4772f2e 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-skb.c +2 -15
index de6d845..d09ad92 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-sock.c +2 -15
index 6cd7d05..92f5112 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-statedump.c +2 -15
index 91e892a..7fbf388 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-sunrpc.c +2 -15
index 8d37414..b4db19d 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-timer.c +2 -15
index 19e3ae5..a504b12 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-udp.c +2 -15
index e915d91..e2d4554 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-user.c +2 -15
index 099a66b..4162a7e 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-user.h +5 -18
index e03e4b0..0939a18 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-v4l2.c +2 -15
index bae153b..064c656 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-vmscan.c +2 -15
index c4b0c50..385d2ef 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-workqueue.c +2 -15
index 9d3192e..cf59f39 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-writeback.c +2 -15
index 45e3f18..d0a4be6 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-x86-exceptions.c +2 -15
index ae239e4..f3794e8 100644

Lines of this file are not shown. View the raw message.

probes/lttng-probe-x86-irq-vectors.c +2 -15
index 7395c79..53172d0 100644

Lines of this file are not shown. View the raw message.

probes/lttng-tracepoint-event-impl.h +2 -15
index 0fee61a..3fe9d99 100644

Lines of this file are not shown. View the raw message.

probes/lttng-tracepoint-event.h +5 -18
index e934b4b..537f577 100644

Lines of this file are not shown. View the raw message.

probes/lttng-types.h +9 -22
index 148111e..dcab602 100644

Lines of this file are not shown. View the raw message.

probes/lttng.c +2 -15
index 449d8a5..c883429 100644

Lines of this file are not shown. View the raw message.

probes/lttng.h +5 -18
index a198ed2..1dfe7bc 100644

Lines of this file are not shown. View the raw message.

tests/Kbuild +2 -0
index 0696c0a..c9391a0 100644

Lines of this file are not shown. View the raw message.

tests/Kconfig +2 -0
index 65e0a2b..7ae0dbf 100644

Lines of this file are not shown. View the raw message.

tests/clock-plugin/lttng-clock-plugin-test.c +2 -15
index 6fbd845..539f2e3 100644

Lines of this file are not shown. View the raw message.

tests/probes/lttng-test.c +2 -15
index 9de84f1..42e48cf 100644

Lines of this file are not shown. View the raw message.

wrapper/atomic.h +5 -18
index f3a3dab..51920c4 100644

Lines of this file are not shown. View the raw message.

wrapper/compiler.h +5 -18
index e4533d4..1496f33 100644

Lines of this file are not shown. View the raw message.

wrapper/fdtable.c +1 -15
index ef39ba6..89fd9c4 100644

Lines of this file are not shown. View the raw message.

wrapper/fdtable.h +5 -18
index 7e74290..72830a5 100644

Lines of this file are not shown. View the raw message.

wrapper/file.h +5 -18
index 37c8c9b..fd77aa7 100644

Lines of this file are not shown. View the raw message.

wrapper/frame.h +5 -18
index ac8f496..6e6dc81 100644

Lines of this file are not shown. View the raw message.

wrapper/ftrace.h +5 -18
index de61873..eb4f788 100644

Lines of this file are not shown. View the raw message.

wrapper/genhd.h +5 -18
index 70b8d3f..a44198a 100644

Lines of this file are not shown. View the raw message.

wrapper/inline_memcpy.h +2 -15
index 6410748..35cc504 100644

Lines of this file are not shown. View the raw message.

wrapper/irq.h +5 -18
index b6feb0c..14db8ac 100644

Lines of this file are not shown. View the raw message.

wrapper/irqdesc.c +2 -15
index fd3f0c1..1d6e289 100644

Lines of this file are not shown. View the raw message.

wrapper/irqdesc.h +5 -18
index d702de1..514d016 100644

Lines of this file are not shown. View the raw message.

wrapper/irqflags.h +5 -18
index d7a7a38..7c33c13 100644

Lines of this file are not shown. View the raw message.

wrapper/kallsyms.h +5 -18
index 8200018..e60fe36 100644

Lines of this file are not shown. View the raw message.

wrapper/kref.h +5 -17
index 3f3be7a..f220ddb 100644

Lines of this file are not shown. View the raw message.

wrapper/kstrtox.h +5 -18
index 4026628..b0c6cf8 100644

Lines of this file are not shown. View the raw message.

wrapper/list.h +5 -17
index 25e8040..4e16786 100644

Lines of this file are not shown. View the raw message.

wrapper/page_alloc.c +1 -15
index dc1fbed..baa8603 100644

Lines of this file are not shown. View the raw message.

wrapper/page_alloc.h +5 -18
index 3a522a9..45462ac 100644

Lines of this file are not shown. View the raw message.

wrapper/percpu-defs.h +5 -18
index bba1bce..53868ad 100644

Lines of this file are not shown. View the raw message.

wrapper/perf.h +5 -18
index 6bd2a5d..48e256c 100644

Lines of this file are not shown. View the raw message.

wrapper/poll.h +5 -18
index c26610e..dde5c55 100644

Lines of this file are not shown. View the raw message.

wrapper/random.c +2 -15
index 82876e7..c938ae3 100644

Lines of this file are not shown. View the raw message.

wrapper/random.h +5 -18
index d3a9487..35539e4 100644

Lines of this file are not shown. View the raw message.

wrapper/rcu.h +5 -18
index 2fc60b1..c2f2115 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/api.h +1 -0
index d1ffd6d..2f128e3 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/backend.h +1 -0
index cdb7209..9e34493 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/backend_internal.h +1 -0
index a2e4db1..9926eec 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/backend_types.h +1 -0
index 4d7a5cc..8d7e3d8 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/config.h +1 -0
index bbb9df3..9268d70 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/frontend.h +1 -0
index 2ae49e2..a1b092d 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/frontend_api.h +1 -0
index d785aad..4a0d8db 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/frontend_internal.h +1 -0
index b2a4bc5..ba23f0d 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/frontend_types.h +1 -0
index f2764e5..d501b86 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/iterator.h +1 -0
index 27f6b23..2b2a553 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/nohz.h +1 -0
index 34bd03f..7d1d259 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/vatomic.h +1 -0
index 7244425..ee0db7e 100644

Lines of this file are not shown. View the raw message.

wrapper/ringbuffer/vfs.h +1 -0
index 0af9936..5cd24e3 100644

Lines of this file are not shown. View the raw message.

wrapper/spinlock.h +5 -18
index bc71b4f..b3570d4 100644

Lines of this file are not shown. View the raw message.

wrapper/splice.c +2 -15
index d24ef3d..44a4d6b 100644

Lines of this file are not shown. View the raw message.

wrapper/splice.h +5 -18
index 91eb864..a0e2b5f 100644

Lines of this file are not shown. View the raw message.

wrapper/time.h +5 -18
index f33791f..527615a 100644

Lines of this file are not shown. View the raw message.

wrapper/timer.h +5 -18
index 4fc9828..a115cf3 100644

Lines of this file are not shown. View the raw message.

wrapper/trace-clock.c +2 -15
index 6ec952b..10e7da0 100644

Lines of this file are not shown. View the raw message.

wrapper/trace-clock.h +5 -18
index 08f9922..a98f034 100644

Lines of this file are not shown. View the raw message.

wrapper/tracepoint.h +5 -18
index 780f9a8..208a8ab 100644

Lines of this file are not shown. View the raw message.

wrapper/types.h +5 -18
index 556a67c..b98e681 100644

Lines of this file are not shown. View the raw message.

wrapper/uuid.h +5 -18
index 48b1a9f..465754e 100644

Lines of this file are not shown. View the raw message.

wrapper/vmalloc.h +5 -18
index b4d7954..0c3eb86 100644

Lines of this file are not shown. View the raw message.

wrapper/vzalloc.h +5 -18
index c052778..eedaf8d 100644

Lines of this file are not shown. View the raw message.

wrapper/writeback.h +5 -18
index 22b2c16..6462466 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
2.17.1

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Part of the diff is not shown here. View the raw message.

#4 lore raw

Re: [PATCH lttng-modules 1/4] Add extra version information framework

In reply to a message not in the archive

Patch 1 merged into master, 2.10, 2.9,

Patches 2, 3, 4 merged into master,

Thanks!

Mathieu

Quoted 244 lines · ----- On Jun 29, 2018, at 5:28 PM, Michael Jeanson [email protected] wrote:

---

.gitignore                   |  2 ++
Kbuild.common                | 14 +++++++++++
extra-version-git.sh         | 20 +++++++++++++++
extra-version-name.sh        | 13 ++++++++++
extra-version-patches.sh     | 21 ++++++++++++++++
extra_version/README         |  2 ++
extra_version/patches/README |  2 ++
lttng-events.c               | 49 +++++++++++++++++++++++++++++++-----
8 files changed, 117 insertions(+), 6 deletions(-)

create mode 100755 extra-version-git.sh
create mode 100755 extra-version-name.sh
create mode 100755 extra-version-patches.sh
create mode 100644 extra_version/README
create mode 100644 extra_version/patches/README

.gitignore +0 -0
index f22e828..38e1684 100644
@@ -79,3 +79,5 @@ GTAGS
 *.orig
 *~

\#*#

.gitignore +2 -0
+
+/extra_version
Kbuild.common +0 -0
index c0d5409..bd24e80 100644
@@ -34,6 +34,20 @@ ifneq ($(RT_PATCH_VERSION), 0)
  ccflags-y += -DRT_PATCH_VERSION=$(RT_PATCH_VERSION)

endif

+EXTRA_VERSION_NAME:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-name.sh $(TOP_LTTNG_MODULES_DIR))

Kbuild.common +6 -0
+
+ifneq ($(EXTRA_VERSION_NAME), 0)
+  ccflags-y += -DLTTNG_EXTRA_VERSION_NAME='"$(EXTRA_VERSION_NAME)"'
+endif
+
+EXTRA_VERSION_GIT:=$(shell $(TOP_LTTNG_MODULES_DIR)/extra-version-git.sh

$(TOP_LTTNG_MODULES_DIR))

Kbuild.common +6 -0
+
+ifneq ($(EXTRA_VERSION_GIT), 0)
+  ccflags-y += -DLTTNG_EXTRA_VERSION_GIT='"$(EXTRA_VERSION_GIT)"'
+endif
+
+EXTRA_VERSION_PATCHES:=$(shell

$(TOP_LTTNG_MODULES_DIR)/extra-version-patches.sh $(TOP_LTTNG_MODULES_DIR)) +
# Starting with kernel 4.12, the ftrace header was moved to private headers

# and as such is not available when building against distro headers instead
# of the full kernel sources. In the situation, define
LTTNG_FTRACE_MISSING_HEADER
extra-version-git.sh new file +9 -0
new file mode 100755
index 0000000..e5a3e17
@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+
+# First argument is the path to the lttng modules sources.
+TOP_LTTNG_MODULES_DIR="$1"
+
+GIT_VERSION="0"
+
+if test -x "$(which git 2>&1;true)" && test -r "${TOP_LTTNG_MODULES_DIR}/.git";

then

extra-version-git.sh new file +6 -2
+	GIT_VERSION_STR="$(cd "${TOP_LTTNG_MODULES_DIR}" && git describe --tags
--dirty)"
+	GIT_CURRENT_TAG="$(cd "${TOP_LTTNG_MODULES_DIR}" && git describe --tags
--exact-match --match="v[0-9]*" HEAD 2> /dev/null)"
+
+	GIT_VERSION="${GIT_VERSION_STR}"
+
+	if ! echo "${GIT_VERSION_STR}" | grep -- "-dirty" >/dev/null && test

"x$GIT_CURRENT_TAG" != "x"; then

extra-version-git.sh new file +5 -0
+		GIT_VERSION="0"
+	fi
+fi
+
+echo "${GIT_VERSION}"
extra-version-name.sh new file +7 -0
new file mode 100755
index 0000000..f704256
@@ -0,0 +1,13 @@
+#!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+
+# First argument is the path to the lttng modules sources.
+TOP_LTTNG_MODULES_DIR="$1"
+
+EXTRA_VERSION_NAME="$(sed -n '1p' "${TOP_LTTNG_MODULES_DIR}/extra_version/name"

2> /dev/null)"

extra-version-name.sh new file +6 -0
+
+if [ "x${EXTRA_VERSION_NAME}" != "x" ]; then
+	echo "${EXTRA_VERSION_NAME}"
+else
+	echo "0"
+fi
extra-version-patches.sh new file +13 -0
new file mode 100755
index 0000000..4e8a1b5
@@ -0,0 +1,21 @@
+#!/bin/sh
+# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+
+# First argument is the path to the lttng modules sources.
+TOP_LTTNG_MODULES_DIR="$1"
+
+if ! test -d "${TOP_LTTNG_MODULES_DIR}"; then
+	exit 1
+fi
+
+TMPFILE="$(mktemp)"
+
+find "${TOP_LTTNG_MODULES_DIR}/extra_version/patches/" -maxdepth 1 ! -name

'README' -type f -printf '%f\n' | sort -r \

extra-version-patches.sh new file +1 -0
+	| sed -E 's/[^a-zA-Z0-9 \.]/-/g ; s/(.*)/MODULE_INFO(extra_version_patch,

"\1");/g' >"${TMPFILE}" 2>/dev/null

extra-version-patches.sh new file +3 -0
+
+if test ! -f "${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i" || \
+	test x"$(cat "${TMPFILE}")" != x"$(cat

"${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i")"; then

extra-version-patches.sh new file +4 -0
+	mv "${TMPFILE}" "${TOP_LTTNG_MODULES_DIR}/extra_version/patches.i"
+fi
+
+rm -f "${TMPFILE}"
extra_version/README new file +2 -0
new file mode 100644
index 0000000..5eef496
@@ -0,0 +1,2 @@
+The first line of the "name" file is used to populate the "extra_version_name"
+modinfo key of each built module.
extra_version/patches/README new file +2 -0
new file mode 100644
index 0000000..22ea3d3
@@ -0,0 +1,2 @@
+The name of each file in this directory except this README will be used to
+populate a "extra_version_path" modinfo key for each built module.
lttng-events.c +12 -2
index ec44502..c1f00ff 100644
@@ -2809,12 +2809,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:

lttng-events.c +0 -0
@@ -2827,12 +2837,22 @@ error_kmem:
 	lttng_tracepoint_exit();

error_tp:

	lttng_context_exit();
lttng-events.c +1 -1
-	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-events.c +11 -1
-		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;
}
lttng-events.c +19 -3
@@ -2850,16 +2870,33 @@ 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 <[email protected]>");
 MODULE_DESCRIPTION("LTTng Events");
--

2.17.1

Signature · 7 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev