Update licensing info

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

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..0e0efc3
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,17 @@
+LTTng modules licensing
+Mathieu Desnoyers
+June 2, 2011
+
+* LGPLv2.1/GPLv2 dual-license
+
+The files contained within this package are licensed under
+LGPLv2.1/GPLv2 dual-license, except for files identified by the
+following section.
+
+* GPLv2 license
+
+These files are licensed exclusively under the GPLv2 license:
+
+lib/ringbuffer/ring_buffer_splice.c
+instrumentation/events/mainline/*.h
+instrumentation/events/lttng-modules/*.h

diff --git a/deprecated/probes/net-extended-trace.c b/deprecated/probes/net-extended-trace.c
index 15fc8109dba704f92c33264a6e41a62eb30111e3..ee05c2e408950966b5f86f764175f9b68a6b882f 100644 (file)
--- a/deprecated/probes/net-extended-trace.c
+++ b/deprecated/probes/net-extended-trace.c
@@ -15,6 +15,8 @@
  * especially interested in the details of network traffic and do not wish to
  * synchronize distributed traces.
  *
+ * (C) Copyright 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ *
  * Dual LGPL v2.1/GPL v2 license.
  */
 

diff --git a/lib/ringbuffer/nohz.h b/lib/ringbuffer/nohz.h
index a2d7e4598579f78d2fa3f07c7ec3e8389dc8032c..3c31072569020d0e8c7dd42a8b95de6561ba43ef 100644 (file)
--- a/lib/ringbuffer/nohz.h
+++ b/lib/ringbuffer/nohz.h
@@ -1,6 +1,14 @@
 #ifndef _LINUX_RING_BUFFER_NOHZ_H
 #define _LINUX_RING_BUFFER_NOHZ_H
 
+/*
+ * ringbuffer/nohz.h
+ *
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #ifdef CONFIG_LIB_RING_BUFFER
 void lib_ring_buffer_tick_nohz_flush(void);
 void lib_ring_buffer_tick_nohz_stop(void);

diff --git a/ltt-context.c b/ltt-context.c
index e0cd073c9c09d854c236b23bb370a224546a8a6a..8f00bb1bd0067437170efa7aaecd23df8768212e 100644 (file)
--- a/ltt-context.c
+++ b/ltt-context.c
@@ -4,6 +4,8 @@
  * Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng trace/channel/event context management.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 37b78de08d173ffbf88d16a9c5fccbba186ec4a3..e192474d5bac68664039c222a30f48d0dedb0959 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -20,6 +20,8 @@
  *     - Takes an instrumentation source as parameter
  *       - e.g. tracepoints, dynamic_probes...
  *     - Takes instrumentation source specific arguments.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index 8483b2750a74106aa30313120affbeaafc07c70e..d91c52d5f5d368ee1e10ccbc78d74998595ec80a 100644 (file)
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -7,6 +7,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng debugfs ABI header
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/fs.h>

diff --git a/ltt-endian.h b/ltt-endian.h
index 29d75df660edc737118cba98bce877adb3bd288d..9a0512d2c2028e1ab77ccc69dc1ebcb560da0406 100644 (file)
--- a/ltt-endian.h
+++ b/ltt-endian.h
@@ -1,6 +1,14 @@
 #ifndef _LTT_ENDIAN_H
 #define _LTT_ENDIAN_H
 
+/*
+ * ltt-endian.h
+ *
+ * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #ifdef __KERNEL__
 # include <asm/byteorder.h>
 # ifdef __BIG_ENDIAN

diff --git a/ltt-events.c b/ltt-events.c
index 1b53d2c11defd6a3fcaaf33a521bd9a93ddacd93..ffcc61ec65d5657fb03a0e0ca7958cb1df43f60f 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng per-session event registry.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/ltt-events.h b/ltt-events.h
index b9bb3bb95d8bba919729afabd17f135a76fe9791..de6ae0e7c3e20ff315ef4c912d552a6020b52d03 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -7,6 +7,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng per-session event registry.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/list.h>

diff --git a/ltt-probes.c b/ltt-probes.c
index 94beb05b8f64e3cbd4667e70ffd488ae4de48160..45d2dabdef22e977fe8122deeb9a5417aa07fc21 100644 (file)
--- a/ltt-probes.c
+++ b/ltt-probes.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Holds LTTng probes registry.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/ltt-tracer-core.h b/ltt-tracer-core.h
index e6756ed7fcddad6a69d3fbc6de8895d55da88b10..d464877de4f23b016c49dc86e432a2c9bb75505e 100644 (file)
--- a/ltt-tracer-core.h
+++ b/ltt-tracer-core.h
@@ -1,14 +1,16 @@
+#ifndef LTT_TRACER_CORE_H
+#define LTT_TRACER_CORE_H
+
 /*
- * Copyright (C) 2005,2006 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
+ * ltt-tracer-core.h
+ *
+ * Copyright (C) 2005-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This contains the core definitions for the Linux Trace Toolkit.
  *
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#ifndef LTT_TRACER_CORE_H
-#define LTT_TRACER_CORE_H
-
 #include <linux/list.h>
 #include <linux/percpu.h>
 

diff --git a/ltt-tracer.h b/ltt-tracer.h
index b4e18f717bd54b300f0bd906d35b3fd21561b76b..d98d9d0c98214f5f87e22fb557f0dccf4122e147 100644 (file)
--- a/ltt-tracer.h
+++ b/ltt-tracer.h
@@ -1,14 +1,16 @@
+#ifndef _LTT_TRACER_H
+#define _LTT_TRACER_H
+
 /*
- * Copyright (C) 2005,2006,2008 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
+ * ltt-tracer.h
+ *
+ * Copyright (C) 2005-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This contains the definitions for the Linux Trace Toolkit tracer.
  *
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#ifndef _LTT_TRACER_H
-#define _LTT_TRACER_H
-
 #include <stdarg.h>
 #include <linux/types.h>
 #include <linux/limits.h>

diff --git a/probes/define_trace.h b/probes/define_trace.h
index 2224fd5d53d2098578bcd7e77cf8150e0a76623f..3c9a46784abc5e3efb3d34d986775fd95cae1801 100644 (file)
--- a/probes/define_trace.h
+++ b/probes/define_trace.h
@@ -1,3 +1,12 @@
+/*
+ * define_trace.h
+ *
+ * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 /*
  * Trace files that want to automate creationg of all tracepoints defined
  * in their file should include this file. The following are macros that the

diff --git a/probes/lttng-events-reset.h b/probes/lttng-events-reset.h
index 0a1671cd372744178107b7bc47268e2307fa1429..5a4089d9dab505d33f37f14a61ffca5408701cc2 100644 (file)
--- a/probes/lttng-events-reset.h
+++ b/probes/lttng-events-reset.h
@@ -1,3 +1,11 @@
+/*
+ * lttng-events-reset.h
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 /* Reset macros used within TRACE_EVENT to "nothing" */
 
 #undef __field

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 8de92ba5ab4854815ab899d431c011fe347710c0..16e268044aefda3a77534605f6b67198ecc56474 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -1,3 +1,12 @@
+/*
+ * lttng-events.h
+ *
+ * Copyright (C) 2009 Steven Rostedt <rostedt@goodmis.org>
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #include <linux/debugfs.h>
 #include "lttng.h"
 #include "lttng-types.h"

diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c
index 43dd2be1c6b279d0e27440a836ef828a69445ceb..9eeebfc3a60020de867dfe857b56ede291277172 100644 (file)
--- a/probes/lttng-probe-block.c
+++ b/probes/lttng-probe-block.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng block probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-probe-irq.c b/probes/lttng-probe-irq.c
index fd4213f053852cf2b6c6f8fe095ccf288cd027bc..4a6a322d144730f2bfb2ac3df995ada0cda3585d 100644 (file)
--- a/probes/lttng-probe-irq.c
+++ b/probes/lttng-probe-irq.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng irq probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-probe-kvm.c b/probes/lttng-probe-kvm.c
index 05988e556c9cb4caf6833a49544e00cd0351f06a..9efc6dd168802a9f8b6e91364af009935e12dbd3 100644 (file)
--- a/probes/lttng-probe-kvm.c
+++ b/probes/lttng-probe-kvm.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng kvm probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-probe-lttng.c b/probes/lttng-probe-lttng.c
index 99a3dd9c0e271d4fb57454467f48d0ffddfd1c52..62aab6c75a765dc8d40d975256499d5193d2d660 100644 (file)
--- a/probes/lttng-probe-lttng.c
+++ b/probes/lttng-probe-lttng.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng core probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-probe-sched.c b/probes/lttng-probe-sched.c
index 8f9f24702833d860fbd08f466449399d633d2651..18c1521de1db03804d75593cf43527d3da93c40b 100644 (file)
--- a/probes/lttng-probe-sched.c
+++ b/probes/lttng-probe-sched.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng sched probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-probe-syscalls.c b/probes/lttng-probe-syscalls.c
index 57ef2c4a07163802c459b15b5b23540b7e55a1b4..3889b5071175eac85111da2b2d40e243642a1fb5 100644 (file)
--- a/probes/lttng-probe-syscalls.c
+++ b/probes/lttng-probe-syscalls.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng sched probes.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-type-list.h b/probes/lttng-type-list.h
index 84acc4e8607bb9e078dc5f60fe7727372ed34a39..7b953dbc5efebcfd13e28d3afc3872cf9fdd26bb 100644 (file)
--- a/probes/lttng-type-list.h
+++ b/probes/lttng-type-list.h
@@ -1,3 +1,11 @@
+/*
+ * lttng-type-list.h
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 /* Type list, used to create metadata */
 
 /* Enumerations */

diff --git a/probes/lttng-types.c b/probes/lttng-types.c
index ecd4c867bf00739d5f5cf82d488228789595e593..93a9ae5436fb6ffb084dc95fcc98be4950055561 100644 (file)
--- a/probes/lttng-types.c
+++ b/probes/lttng-types.c
@@ -4,6 +4,8 @@
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng types.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>

diff --git a/probes/lttng-types.h b/probes/lttng-types.h
index cec2739e69fa540e1f62229b5952ccbb6f4e90c9..10620280baf6d4d8ecb34250555e06e402e3479c 100644 (file)
--- a/probes/lttng-types.h
+++ b/probes/lttng-types.h
@@ -5,6 +5,16 @@
 #ifndef _LTTNG_PROBES_LTTNG_TYPES_H
 #define _LTTNG_PROBES_LTTNG_TYPES_H
 
+/*
+ * probes/lttng-types.h
+ *
+ * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * LTTng types.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #include <linux/seq_file.h>
 #include "lttng.h"
 #include "../ltt-events.h"

diff --git a/probes/lttng.h b/probes/lttng.h
index f87017bae00bd057a6179f5e4af491b3d0bb7174..e16fc2dd8ce5b8e6283e515a289c02cd077358bc 100644 (file)
--- a/probes/lttng.h
+++ b/probes/lttng.h
@@ -1,6 +1,14 @@
 #ifndef _LTTNG_PROBES_LTTNG_H
 #define _LTTNG_PROBES_LTTNG_H
 
+/*
+ * lttng.h
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #undef PARAMS
 #define PARAMS(args...)                args
 

diff --git a/wrapper/inline_memcpy.h b/wrapper/inline_memcpy.h
index ae4ba10e985c7ca881b245a2b5925a77f34b22d3..33150cdb5b5edc9692469e15520aab5ec3e588e4 100644 (file)
--- a/wrapper/inline_memcpy.h
+++ b/wrapper/inline_memcpy.h
@@ -1,3 +1,11 @@
+/*
+ * wrapper/inline_memcpy.h
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #if !defined(__HAVE_ARCH_INLINE_MEMCPY) && !defined(inline_memcpy)
 #define inline_memcpy memcpy
 #endif

diff --git a/wrapper/poll.h b/wrapper/poll.h
index 71ebce94bb50218a729aaa8d4391bd1f48789d3c..416ce5740da7a6e15b88401e209c49dc54860310 100644 (file)
--- a/wrapper/poll.h
+++ b/wrapper/poll.h
@@ -1,3 +1,11 @@
+/*
+ * wrapper/poll.h
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
 #ifndef CONFIG_LIB_RING_BUFFER
 #include <linux/poll.h>