X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=LICENSE;h=95c7287e943946461b664fca12a87a1fd1d35978;hb=d001c88633f6a58e94eb73f4814976d13f61bd77;hp=ad13f78d449a8824c3c8551da19247f1d82300cb;hpb=7abf2d0da3b328572a17c9457b33c3890b0ba58b;p=userspace-rcu.git

diff --git a/LICENSE b/LICENSE
index ad13f78..95c7287 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,18 +1,13 @@
 Userspace RCU library licensing
 Mathieu Desnoyers
-May 10, 2009
+September 3, 2012
 
 
 * LGPLv2.1
 
-The library part is distributed under LGPLv2.1 or later. See lgpl-2.1.txt for
-details. This applies to :
-
-urcu.h
-urcu.c
-urcu-static.h
-arch_x86.h
-arch_ppc.h
+The library part is distributed under LGPLv2.1 or later. See
+LICENSES/LGPL-2.1-or-later.txt for license details. Refer to the individual
+file headers for details.
 
 LGPL-compatible source code can statically use the library header using :
 
@@ -23,37 +18,42 @@ Dynamic-only linking with the LGPL library is used if _LGPL_SOURCE is not
 defined. It permits relinking with newer versions of the library, which is
 required by the LGPL license.
 
-See lgpl-relicensing.txt for details.
+See lgpl-relicensing.md for details.
 
 
-* MIT-style license :
+* Boehm-GC (MIT-style) license :
 
 xchg() primitive has been rewritten from scratch starting from atomic_ops 1.2
 which has a MIT-style license that is intended to allow use in both free and
 proprietary software:
+
 	http://www.hpl.hp.com/research/linux/atomic_ops/LICENSING.txt
 	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
-This license applies to :
+This license applies to:
+
+uatomic/gcc.h
+uatomic/unknown.h
+uatomic/generic.h
+uatomic/sparc64.h
+uatomic/arm.h
+uatomic/ppc.h
+uatomic/x86.h
+uatomic.h
+
+MIT/X11 (BSD like) license apply to:
 
-arch_atomic_x86.h
-arch_atomic_ppc.h
-arch_atomic_s390.h
-arch_s390.h
 compiler.h
+arch/s390.h
+uatomic/alpha.h
+uatomic/mips.h
+uatomic/nios2.h
+uatomic/s390.h
+system.h
 
 
 * GPLv2
 
-Library test code is distributed under the GPLv2 license. See gpl-2.0.txt for
-details. This applies to :
-
-urcutorture.h
-urcutorture.c
-api_x86.h
-api_ppc.h
-api_gcc.h
-test_urcu.c
-test_urcu_yield.c
-test_rwlock_timing.c
-urcu-asm.c
+Library test code is distributed under the GPLv2 license. See
+LICENSES/GPL-2.0-only.txt for license details. See headers of individual files
+under tests/ for details.