Fix: use known license text, fix incorrect FSF address

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

diff --git a/tests/api.h b/tests/api.h
index 03c370b12d40b94519a33adfc8b55f2f214c1ac3..9746ea4389cd945cec76eb75043d9732b54ed64f 100644 (file)
--- a/tests/api.h
+++ b/tests/api.h
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (c) 2006 Paul E. McKenney, IBM.
  *
@@ -54,7 +54,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (c) 2006 Paul E. McKenney, IBM.
  */

diff --git a/tests/rcutorture.h b/tests/rcutorture.h
index 4c6f9daa86e7896ac2bf4060308fb85a99da4f83..f8548d811ed8980061716cc797a63524d97524a4 100644 (file)
--- a/tests/rcutorture.h
+++ b/tests/rcutorture.h
@@ -56,7 +56,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (c) 2008 Paul E. McKenney, IBM Corporation.
  */

diff --git a/tests/test_cycles_per_loop.c b/tests/test_cycles_per_loop.c
index cafa309b9d35e6f8d932e62f56a72482470b28ba..73980fa2214a0a30b1beea1ef68d44b30ee01baa 100644 (file)
--- a/tests/test_cycles_per_loop.c
+++ b/tests/test_cycles_per_loop.c
@@ -1,3 +1,25 @@
+/*
+ * test_cycles_per_loop.c
+ *
+ * Userspace RCU library - test cycles per loop
+ *
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * 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 <urcu/arch.h>
 #include <stdio.h>
 

diff --git a/tests/test_uatomic.c b/tests/test_uatomic.c
index 692060bcdf175763e2290c6c207d7d66366928c9..3faae661f4bb1382de593d17f26f6462b088dd33 100644 (file)
--- a/tests/test_uatomic.c
+++ b/tests/test_uatomic.c
@@ -1,3 +1,25 @@
+/*
+ * test_uatomic.c
+ *
+ * Userspace RCU library - test atomic operations
+ *
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * 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 <stdio.h>
 #include <assert.h>
 #include <urcu/uatomic.h>

diff --git a/urcu/compiler.h b/urcu/compiler.h
index f977b95fdc60f73b6ef6c9ab2b96c4c30a884de2..08bd9e9f44fa004a744f98d1734a5131bc670428 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -8,14 +8,15 @@
  *
  * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * 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:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <stddef.h>    /* for offsetof */

diff --git a/urcu/futex.h b/urcu/futex.h
index 98acc12855515e7ca0c5bf9ca42fd3fb988e0f30..906d9b723ae88481fc7874e1409dc24dd80f35eb 100644 (file)
--- a/urcu/futex.h
+++ b/urcu/futex.h
@@ -6,6 +6,8 @@
  *
  * Userspace RCU - sys_futex/compat_futex header.
  *
+ * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
  * 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; either

diff --git a/urcu/system.h b/urcu/system.h
index 4ae3ba0d34eeb50f3fc01c316286d51921714e58..38e8ecc771b345c1e463742a446b62f90cbad8d7 100644 (file)
--- a/urcu/system.h
+++ b/urcu/system.h
@@ -8,14 +8,15 @@
  *
  * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * 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:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <urcu/compiler.h>