From 3282a76b46b74a92809292fa63ba671de9ad88eb Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 8 Mar 2012 12:50:11 -0500 Subject: [PATCH] Fix: use known license text, fix incorrect FSF address Signed-off-by: Mathieu Desnoyers --- tests/api.h | 4 ++-- tests/rcutorture.h | 2 +- tests/test_cycles_per_loop.c | 22 ++++++++++++++++++++++ tests/test_uatomic.c | 22 ++++++++++++++++++++++ urcu/compiler.h | 15 ++++++++------- urcu/futex.h | 2 ++ urcu/system.h | 15 ++++++++------- 7 files changed, 65 insertions(+), 17 deletions(-) diff --git a/tests/api.h b/tests/api.h index 03c370b..9746ea4 100644 --- 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 4c6f9da..f8548d8 100644 --- 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 cafa309..73980fa 100644 --- 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 + * + * 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 #include diff --git a/tests/test_uatomic.c b/tests/test_uatomic.c index 692060b..3faae66 100644 --- 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 + * + * 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 #include #include diff --git a/urcu/compiler.h b/urcu/compiler.h index f977b95..08bd9e9 100644 --- a/urcu/compiler.h +++ b/urcu/compiler.h @@ -8,14 +8,15 @@ * * Copyright (c) 2009 Mathieu Desnoyers * - * 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 /* for offsetof */ diff --git a/urcu/futex.h b/urcu/futex.h index 98acc12..906d9b7 100644 --- a/urcu/futex.h +++ b/urcu/futex.h @@ -6,6 +6,8 @@ * * Userspace RCU - sys_futex/compat_futex header. * + * Copyright 2011-2012 - Mathieu Desnoyers + * * 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 4ae3ba0..38e8ecc 100644 --- a/urcu/system.h +++ b/urcu/system.h @@ -8,14 +8,15 @@ * * Copyright (c) 2009 Mathieu Desnoyers * - * 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 -- 2.34.1