Module Name: src
Committed By: pgoyette
Date: Sat Apr 29 10:50:46 UTC 2017
Modified Files:
src/sys/dev [prg-localcount2]: ccd.c cgd.c vnd.c
src/sys/dev/sysmon [prg-localcount2]: sysmon.c
src/sys/net [prg-localcount2]: if_tun.c
src/sys/net/npf [prg-localcount2]: npf_os.c
Log Message:
Remove explicit inclusion of <sys/localcount.h> since there is no
explicit usage of localcounts here. <sys/conf.h> will take care of
including as needed.
To generate a diff of this commit:
cvs rdiff -u -r1.171.4.1 -r1.171.4.2 src/sys/dev/ccd.c
cvs rdiff -u -r1.114.4.5 -r1.114.4.6 src/sys/dev/cgd.c
cvs rdiff -u -r1.259.4.3 -r1.259.4.4 src/sys/dev/vnd.c
cvs rdiff -u -r1.28.8.1 -r1.28.8.2 src/sys/dev/sysmon/sysmon.c
cvs rdiff -u -r1.138.4.1 -r1.138.4.2 src/sys/net/if_tun.c
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/sys/net/npf/npf_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.171.4.1 src/sys/dev/ccd.c:1.171.4.2
--- src/sys/dev/ccd.c:1.171.4.1 Sat Apr 29 09:17:58 2017
+++ src/sys/dev/ccd.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.171.4.1 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.171.4.2 2017/04/29 10:50:46 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.171.4.1 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.171.4.2 2017/04/29 10:50:46 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -105,7 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.17
#include <sys/module.h>
#include <sys/namei.h>
#include <sys/stat.h>
-#include <sys/localcount.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/device.h>
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.114.4.5 src/sys/dev/cgd.c:1.114.4.6
--- src/sys/dev/cgd.c:1.114.4.5 Sat Apr 29 08:55:37 2017
+++ src/sys/dev/cgd.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.114.4.5 2017/04/29 08:55:37 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.114.4.6 2017/04/29 10:50:46 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.5 2017/04/29 08:55:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.114.4.6 2017/04/29 10:50:46 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.11
#include <sys/vnode.h>
#include <sys/conf.h>
#include <sys/syslog.h>
-#include <sys/localcount.h>
#include <dev/dkvar.h>
#include <dev/cgdvar.h>
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.259.4.3 src/sys/dev/vnd.c:1.259.4.4
--- src/sys/dev/vnd.c:1.259.4.3 Fri Apr 28 23:16:14 2017
+++ src/sys/dev/vnd.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.259.4.3 2017/04/28 23:16:14 pgoyette Exp $ */
+/* $NetBSD: vnd.c,v 1.259.4.4 2017/04/29 10:50:46 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.259.4.3 2017/04/28 23:16:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.259.4.4 2017/04/29 10:50:46 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -119,7 +119,6 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.25
#include <sys/conf.h>
#include <sys/kauth.h>
#include <sys/module.h>
-#include <sys/localcount.h>
#include <net/zlib.h>
Index: src/sys/dev/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.28.8.1 src/sys/dev/sysmon/sysmon.c:1.28.8.2
--- src/sys/dev/sysmon/sysmon.c:1.28.8.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/sysmon/sysmon.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.28.8.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.28.8.2 2017/04/29 10:50:46 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.8.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28.8.2 2017/04/29 10:50:46 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1
#include <sys/mutex.h>
#include <sys/device.h>
#include <sys/once.h>
-#include <sys/localcount.h>
#include <dev/sysmon/sysmonvar.h>
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.138.4.1 src/sys/net/if_tun.c:1.138.4.2
--- src/sys/net/if_tun.c:1.138.4.1 Fri Apr 28 03:46:57 2017
+++ src/sys/net/if_tun.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.138.4.1 2017/04/28 03:46:57 pgoyette Exp $ */
+/* $NetBSD: if_tun.c,v 1.138.4.2 2017/04/29 10:50:46 pgoyette Exp $ */
/*
* Copyright (c) 1988, Julian Onions <j...@cs.nott.ac.uk>
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.138.4.1 2017/04/28 03:46:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.138.4.2 2017/04/29 10:50:46 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1
#include <sys/ioctl.h>
#include <sys/kauth.h>
#include <sys/kmem.h>
-#include <sys/localcount.h>
#include <sys/lwp.h>
#include <sys/mbuf.h>
#include <sys/module.h>
Index: src/sys/net/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.6.6.1 src/sys/net/npf/npf_os.c:1.6.6.2
--- src/sys/net/npf/npf_os.c:1.6.6.1 Fri Apr 28 02:13:19 2017
+++ src/sys/net/npf/npf_os.c Sat Apr 29 10:50:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_os.c,v 1.6.6.1 2017/04/28 02:13:19 pgoyette Exp $ */
+/* $NetBSD: npf_os.c,v 1.6.6.2 2017/04/29 10:50:46 pgoyette Exp $ */
/*-
* Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6.6.1 2017/04/28 02:13:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6.6.2 2017/04/29 10:50:46 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "pf.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1
#include <sys/conf.h>
#include <sys/kauth.h>
#include <sys/kmem.h>
-#include <sys/localcount.h>
#include <sys/lwp.h>
#include <sys/module.h>
#include <sys/socketvar.h>
