Merge license blocks now that they are identical.

diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index cf634c1..03a7bfd 100644 (file)
--- 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>