diff options
| author |   daniel <daniel@openbsd.org> | 2014-10-14 03:23:27 +0000 |
|---|---|---|
| committer | daniel <daniel@openbsd.org> | 2014-10-14 03:23:27 +0000 |
| commit | d6a21e3872f40926f613d4d8d49f24087a13acf7 (patch) | |
| tree | 5d68e677827632ec5f4b5fb65e10fdd641b623fc | |
| parent | plug a memory leak; from Maxime Villard. (diff) | |
| download | wireguard-openbsd-d6a21e3872f40926f613d4d8d49f24087a13acf7.tar.xz wireguard-openbsd-d6a21e3872f40926f613d4d8d49f24087a13acf7.zip | |
NetBSD revision 1.20 of pmap.h (from 1996) deleted license text that should
not have been removed (per the license conditions).
Revert that removal of the BSD license text and conditions. Special thanks to
Aaron Brown who also provided explicit permission to make this change.
ok schwarze@, miod@
| -rw-r--r-- | sys/arch/sparc/include/pmap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index bed3dfd7f9a..3a47c7f41be 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.54 2014/01/30 18:16:41 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.55 2014/10/14 03:23:27 daniel Exp $ */ /* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */ /* @@ -18,7 +18,14 @@ * This product includes software developed by the University of * California, Lawrence Berkeley Laboratory. * - * @InsertRedistribution@ + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Aaron Brown and |