diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-02-10 12:59:25 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-02-10 12:59:25 +0000 |
| commit | 11c4b8d9594ce51c9da30598858a76a8c973dac9 (patch) | |
| tree | 6abef3eff990f14b1af8ceb6b6718fffa2d61614 /sys | |
| parent | e24e914b448ef1ba564dbb8e8f18fe9b6495a718 (diff) | |
Merge license blocks now that they are identical.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_lock.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index cf634c19a01..03a7bfd0651 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -1,6 +1,7 @@ -/* $OpenBSD: kern_lock.c,v 1.55 2018/02/10 12:53:22 mpi Exp $ */ +/* $OpenBSD: kern_lock.c,v 1.56 2018/02/10 12:59:24 mpi Exp $ */ /* + * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any @@ -83,21 +84,6 @@ _kernel_lock_held(void) #ifdef __USE_MI_MPLOCK /* Ticket lock implementation */ -/* - * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ #include <machine/cpu.h> |