CVS commit: src

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Feb 27 14:16:33 UTC 2022

Modified Files:
        src/external/cddl/osnet/dev/lockstat: lockstat.c
        src/sys/dev: lockstat.c

Log Message:
lockstat(4): KNF.  No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/dev/lockstat/lockstat.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/lockstat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/cddl/osnet/dev/lockstat/lockstat.c
diff -u src/external/cddl/osnet/dev/lockstat/lockstat.c:1.11 src/external/cddl/osnet/dev/lockstat/lockstat.c:1.12
--- src/external/cddl/osnet/dev/lockstat/lockstat.c:1.11	Sun Feb 27 14:16:12 2022
+++ src/external/cddl/osnet/dev/lockstat/lockstat.c	Sun Feb 27 14:16:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockstat.c,v 1.11 2022/02/27 14:16:12 riastradh Exp $	*/
+/*	$NetBSD: lockstat.c,v 1.12 2022/02/27 14:16:32 riastradh Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -26,18 +26,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.11 2022/02/27 14:16:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.12 2022/02/27 14:16:32 riastradh Exp $");
 
 #include <sys/types.h>
-#include <sys/proc.h>
 #include <sys/param.h>
+
+#include <sys/atomic.h>
 #include <sys/conf.h>
 #include <sys/dtrace.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/xcall.h>
-#include <sys/atomic.h>
 
 #define NLOCKSTAT 1
 #include <dev/lockstat.h>

Index: src/sys/dev/lockstat.c
diff -u src/sys/dev/lockstat.c:1.28 src/sys/dev/lockstat.c:1.29
--- src/sys/dev/lockstat.c:1.28	Sun Feb 27 14:16:12 2022
+++ src/sys/dev/lockstat.c	Sun Feb 27 14:16:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: lockstat.c,v 1.28 2022/02/27 14:16:12 riastradh Exp $	*/
+/*	$NetBSD: lockstat.c,v 1.29 2022/02/27 14:16:32 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2019 The NetBSD Foundation, Inc.
@@ -41,25 +41,25 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.28 2022/02/27 14:16:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.29 2022/02/27 14:16:32 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/proc.h> 
-#include <sys/resourcevar.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/kmem.h>
+
+#include <sys/atomic.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
 #include <sys/syslog.h>
-#include <sys/atomic.h>
+#include <sys/systm.h>
 #include <sys/xcall.h>
 
 #include <dev/lockstat.h>
 
-#include <machine/lock.h>
-
 #include "ioconf.h"
 
 #ifndef __HAVE_CPU_COUNTER
@@ -353,7 +353,7 @@ lockstat_alloc(lsenable_t *le)
 	KASSERT(lockstat_baseb == NULL);
 	lockstat_sizeb = sz;
 	lockstat_baseb = lb;
-		
+
 	return (0);
 }