Module Name: src
Committed By: pgoyette
Date: Sat Apr 29 11:12:15 UTC 2017
Modified Files:
src/sys/dev [prg-localcount2]: audio.c fss.c ld.c md.c rndpseudo.c
spkr.c
src/sys/dev/dm [prg-localcount2]: device-mapper.c
src/sys/dev/pad [prg-localcount2]: pad.c
src/sys/dev/pci [prg-localcount2]: pci_usrreq.c
src/sys/dev/pud [prg-localcount2]: pud_dev.c
src/sys/dev/putter [prg-localcount2]: putter.c
src/sys/dev/raidframe [prg-localcount2]: rf_netbsdkintf.c
src/sys/dev/scsipi [prg-localcount2]: cd.c
src/sys/dev/usb [prg-localcount2]: ucom.c ulpt.c
src/sys/dev/wscons [prg-localcount2]: wskbd.c wsmouse.c
src/sys/external/bsd/ipf/netinet [prg-localcount2]: ip_fil_netbsd.c
src/sys/kern [prg-localcount2]: kern_drvctl.c tty_ptm.c tty_pty.c
tty_tty.c
src/sys/net [prg-localcount2]: bpf.c
src/sys/net/npf [prg-localcount2]: npf.c
src/sys/netsmb [prg-localcount2]: smb_dev.c
src/sys/opencrypto [prg-localcount2]: cryptodev.c
src/sys/rump/librump/rumpvfs [prg-localcount2]: devnull.c rumpblk.c
Log Message:
Remove more unnecessary #include for sys/localcount.h
To generate a diff of this commit:
cvs rdiff -u -r1.327.2.1 -r1.327.2.2 src/sys/dev/audio.c
cvs rdiff -u -r1.97.4.2 -r1.97.4.3 src/sys/dev/fss.c
cvs rdiff -u -r1.100.4.1 -r1.100.4.2 src/sys/dev/ld.c
cvs rdiff -u -r1.78.6.3 -r1.78.6.4 src/sys/dev/md.c
cvs rdiff -u -r1.35.8.1 -r1.35.8.2 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.6.10.1 -r1.6.10.2 src/sys/dev/spkr.c
cvs rdiff -u -r1.38.8.1 -r1.38.8.2 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.28.4.1 -r1.28.4.2 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.30.6.1 -r1.30.6.2 src/sys/dev/pci/pci_usrreq.c
cvs rdiff -u -r1.7.8.1 -r1.7.8.2 src/sys/dev/pud/pud_dev.c
cvs rdiff -u -r1.35.18.1 -r1.35.18.2 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.349.4.1 -r1.349.4.2 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.340.4.1 -r1.340.4.2 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.118.6.1 -r1.118.6.2 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.98.6.1 -r1.98.6.2 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.138.6.1 -r1.138.6.2 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.66.18.1 -r1.66.18.2 src/sys/dev/wscons/wsmouse.c
cvs rdiff -u -r1.22.4.3 -r1.22.4.4 \
src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -u -r1.41.8.1 -r1.41.8.2 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.37.8.1 -r1.37.8.2 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.142.8.1 -r1.142.8.2 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.40.18.1 -r1.40.18.2 src/sys/kern/tty_tty.c
cvs rdiff -u -r1.216.4.1 -r1.216.4.2 src/sys/net/bpf.c
cvs rdiff -u -r1.33.6.1 -r1.33.6.2 src/sys/net/npf/npf.c
cvs rdiff -u -r1.49.6.1 -r1.49.6.2 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.89.2.1 -r1.89.2.2 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.7.8.1 -r1.7.8.2 src/sys/rump/librump/rumpvfs/devnull.c
cvs rdiff -u -r1.64.8.1 -r1.64.8.2 src/sys/rump/librump/rumpvfs/rumpblk.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/audio.c
diff -u src/sys/dev/audio.c:1.327.2.1 src/sys/dev/audio.c:1.327.2.2
--- src/sys/dev/audio.c:1.327.2.1 Thu Apr 27 05:36:35 2017
+++ src/sys/dev/audio.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.327.2.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: audio.c,v 1.327.2.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.327.2.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.327.2.2 2017/04/29 11:12:14 pgoyette Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -179,7 +179,6 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
#include <sys/intr.h>
#include <sys/kthread.h>
#include <sys/cpu.h>
-#include <sys/localcount.h>
#include <dev/audio_if.h>
#include <dev/audiovar.h>
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.97.4.2 src/sys/dev/fss.c:1.97.4.3
--- src/sys/dev/fss.c:1.97.4.2 Fri Apr 28 06:00:33 2017
+++ src/sys/dev/fss.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.97.4.2 2017/04/28 06:00:33 pgoyette Exp $ */
+/* $NetBSD: fss.c,v 1.97.4.3 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.97.4.2 2017/04/28 06:00:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.97.4.3 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.97
#include <sys/kthread.h>
#include <sys/fstrans.h>
#include <sys/vfs_syscalls.h> /* For do_sys_unlink(). */
-#include <sys/localcount.h>
#include <miscfs/specfs/specdev.h>
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.100.4.1 src/sys/dev/ld.c:1.100.4.2
--- src/sys/dev/ld.c:1.100.4.1 Thu Apr 27 05:36:35 2017
+++ src/sys/dev/ld.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.100.4.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: ld.c,v 1.100.4.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.100.4.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.100.4.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.100
#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/mutex.h>
-#include <sys/localcount.h>
#include <sys/module.h>
#include <sys/reboot.h>
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.78.6.3 src/sys/dev/md.c:1.78.6.4
--- src/sys/dev/md.c:1.78.6.3 Fri Apr 28 06:00:33 2017
+++ src/sys/dev/md.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.78.6.3 2017/04/28 06:00:33 pgoyette Exp $ */
+/* $NetBSD: md.c,v 1.78.6.4 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.78.6.3 2017/04/28 06:00:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.78.6.4 2017/04/29 11:12:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.78.
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
-#include <sys/localcount.h>
#include <uvm/uvm_extern.h>
@@ -196,8 +195,7 @@ md_attach(device_t parent, device_t self
}
/*
- * Caller must hold a reference to the device's localcount. The reference
- * is released if detach is successful.
+ * Caller must hold a reference to the device's localcount.
*/
static int
md_detach(device_t self, int flags)
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.35.8.1 src/sys/dev/rndpseudo.c:1.35.8.2
--- src/sys/dev/rndpseudo.c:1.35.8.1 Thu Apr 27 05:36:35 2017
+++ src/sys/dev/rndpseudo.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.35.8.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.35.8.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35.8.1 2017/04/27 05:36:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35.8.2 2017/04/29 11:12:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,
#include <sys/stat.h>
#include <sys/systm.h>
#include <sys/vnode.h>
-#include <sys/localcount.h>
#include <dev/rnd_private.h>
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.6.10.1 src/sys/dev/spkr.c:1.6.10.2
--- src/sys/dev/spkr.c:1.6.10.1 Sat Apr 29 09:17:58 2017
+++ src/sys/dev/spkr.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.6.10.1 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: spkr.c,v 1.6.10.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,13 +43,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.6.10.1 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.6.10.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/errno.h>
-#include <sys/localcount.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/module.h>
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.38.8.1 src/sys/dev/dm/device-mapper.c:1.38.8.2
--- src/sys/dev/dm/device-mapper.c:1.38.8.1 Thu Apr 27 05:36:35 2017
+++ src/sys/dev/dm/device-mapper.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.38.8.1 2017/04/27 05:36:35 pgoyette Exp $ */
+/* $NetBSD: device-mapper.c,v 1.38.8.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -46,7 +46,6 @@
#include <sys/ioccom.h>
#include <sys/kmem.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include "netbsd-dm.h"
#include "dm.h"
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.28.4.1 src/sys/dev/pad/pad.c:1.28.4.2
--- src/sys/dev/pad/pad.c:1.28.4.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/pad/pad.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.28.4.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: pad.c,v 1.28.4.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.28.4.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.28.4.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.28
#include <sys/module.h>
#include <sys/atomic.h>
#include <sys/time.h>
-#include <sys/localcount.h>
#include <dev/audio_if.h>
#include <dev/audiovar.h>
Index: src/sys/dev/pci/pci_usrreq.c
diff -u src/sys/dev/pci/pci_usrreq.c:1.30.6.1 src/sys/dev/pci/pci_usrreq.c:1.30.6.2
--- src/sys/dev/pci/pci_usrreq.c:1.30.6.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/pci/pci_usrreq.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.30.6.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.30.6.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.30.6.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.30.6.2 2017/04/29 11:12:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: src/sys/dev/pud/pud_dev.c
diff -u src/sys/dev/pud/pud_dev.c:1.7.8.1 src/sys/dev/pud/pud_dev.c:1.7.8.2
--- src/sys/dev/pud/pud_dev.c:1.7.8.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/pud/pud_dev.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pud_dev.c,v 1.7.8.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: pud_dev.c,v 1.7.8.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pud_dev.c,v 1.7.8.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pud_dev.c,v 1.7.8.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: pud_dev.c,v
#include <sys/kmem.h>
#include <sys/poll.h>
#include <sys/socketvar.h>
-#include <sys/localcount.h>
#include <dev/pud/pud_sys.h>
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.35.18.1 src/sys/dev/putter/putter.c:1.35.18.2
--- src/sys/dev/putter/putter.c:1.35.18.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/putter/putter.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.35.18.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: putter.c,v 1.35.18.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.35.18.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.35.18.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: putter.c,v 1
#include <sys/socketvar.h>
#include <sys/module.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include <dev/putter/putter_sys.h>
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.349.4.1 src/sys/dev/raidframe/rf_netbsdkintf.c:1.349.4.2
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.349.4.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.349.4.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.349.4.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.349.4.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.349.4.2 2017/04/29 11:12:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -127,7 +127,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkin
#include <sys/reboot.h>
#include <sys/kauth.h>
#include <sys/module.h>
-#include <sys/localcount.h>
#include <prop/proplib.h>
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.340.4.1 src/sys/dev/scsipi/cd.c:1.340.4.2
--- src/sys/dev/scsipi/cd.c:1.340.4.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/scsipi/cd.c Sat Apr 29 11:12:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.340.4.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: cd.c,v 1.340.4.2 2017/04/29 11:12:14 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.340.4.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.340.4.2 2017/04/29 11:12:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.340
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/rndsource.h>
-#include <sys/localcount.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsipi_all.h>
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.118.6.1 src/sys/dev/usb/ucom.c:1.118.6.2
--- src/sys/dev/usb/ucom.c:1.118.6.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/usb/ucom.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.118.6.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: ucom.c,v 1.118.6.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118.6.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118.6.2 2017/04/29 11:12:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.1
#include <sys/sysctl.h>
#include <sys/timepps.h>
#include <sys/rndsource.h>
-#include <sys/localcount.h>
#include <dev/usb/usb.h>
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.98.6.1 src/sys/dev/usb/ulpt.c:1.98.6.2
--- src/sys/dev/usb/ulpt.c:1.98.6.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/usb/ulpt.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.98.6.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: ulpt.c,v 1.98.6.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.98.6.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.98.6.2 2017/04/29 11:12:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -52,7 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.9
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/syslog.h>
-#include <sys/localcount.h>
#include <machine/vmparam.h> /* PAGE_SIZE */
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.138.6.1 src/sys/dev/wscons/wskbd.c:1.138.6.2
--- src/sys/dev/wscons/wskbd.c:1.138.6.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/wscons/wskbd.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.138.6.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: wskbd.c,v 1.138.6.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.138.6.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.138.6.2 2017/04/29 11:12:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -134,7 +134,6 @@ __KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.
#include <sys/fcntl.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
Index: src/sys/dev/wscons/wsmouse.c
diff -u src/sys/dev/wscons/wsmouse.c:1.66.18.1 src/sys/dev/wscons/wsmouse.c:1.66.18.2
--- src/sys/dev/wscons/wsmouse.c:1.66.18.1 Thu Apr 27 05:36:36 2017
+++ src/sys/dev/wscons/wsmouse.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.66.18.1 2017/04/27 05:36:36 pgoyette Exp $ */
+/* $NetBSD: wsmouse.c,v 1.66.18.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.66.18.1 2017/04/27 05:36:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.66.18.2 2017/04/29 11:12:15 pgoyette Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -125,7 +125,6 @@ __KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v
#include <sys/vnode.h>
#include <sys/callout.h>
#include <sys/malloc.h>
-#include <sys/localcount.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.3 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.4
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.22.4.3 Sat Apr 29 10:19:32 2017
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.22.4.3 2017/04/29 10:19:32 pgoyette Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.22.4.4 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.22.4.3 2017/04/29 10:19:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.22.4.4 2017/04/29 11:12:15 pgoyette Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -57,9 +57,6 @@ static const char rcsid[] = "@(#)Id: ip_
#include <sys/module.h>
#include <sys/mutex.h>
#endif
-#if (__NetBSD_Version__ >= 799003300)
-#include <sys/localcount.h>
-#endif
#include <net/if.h>
#include <net/route.h>
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.41.8.1 src/sys/kern/kern_drvctl.c:1.41.8.2
--- src/sys/kern/kern_drvctl.c:1.41.8.1 Thu Apr 27 05:36:37 2017
+++ src/sys/kern/kern_drvctl.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.41.8.1 2017/04/27 05:36:37 pgoyette Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.41.8.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41.8.1 2017/04/27 05:36:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.41.8.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_drvctl.
#include <sys/kauth.h>
#include <sys/lwp.h>
#include <sys/module.h>
-#include <sys/localcount.h>
#include "ioconf.h"
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.37.8.1 src/sys/kern/tty_ptm.c:1.37.8.2
--- src/sys/kern/tty_ptm.c:1.37.8.1 Thu Apr 27 05:36:37 2017
+++ src/sys/kern/tty_ptm.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.37.8.1 2017/04/27 05:36:37 pgoyette Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37.8.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.8.1 2017/04/27 05:36:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37.8.2 2017/04/29 11:12:15 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v
#include <sys/poll.h>
#include <sys/pty.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include <miscfs/specfs/specdev.h>
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.142.8.1 src/sys/kern/tty_pty.c:1.142.8.2
--- src/sys/kern/tty_pty.c:1.142.8.1 Thu Apr 27 05:36:37 2017
+++ src/sys/kern/tty_pty.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.142.8.1 2017/04/27 05:36:37 pgoyette Exp $ */
+/* $NetBSD: tty_pty.c,v 1.142.8.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142.8.1 2017/04/27 05:36:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.142.8.2 2017/04/29 11:12:15 pgoyette Exp $");
#include "opt_ptm.h"
@@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v
#include <sys/poll.h>
#include <sys/pty.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
#include "ioconf.h"
Index: src/sys/kern/tty_tty.c
diff -u src/sys/kern/tty_tty.c:1.40.18.1 src/sys/kern/tty_tty.c:1.40.18.2
--- src/sys/kern/tty_tty.c:1.40.18.1 Thu Apr 27 05:36:37 2017
+++ src/sys/kern/tty_tty.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_tty.c,v 1.40.18.1 2017/04/27 05:36:37 pgoyette Exp $ */
+/* $NetBSD: tty_tty.c,v 1.40.18.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993, 1995
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v 1.40.18.1 2017/04/27 05:36:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v 1.40.18.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: tty_tty.c,v
#include <sys/file.h>
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <sys/localcount.h>
/* XXXSMP */
#define cttyvp(p) ((p)->p_lflag & PL_CONTROLT ? (p)->p_session->s_ttyvp : NULL)
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.216.4.1 src/sys/net/bpf.c:1.216.4.2
--- src/sys/net/bpf.c:1.216.4.1 Thu Apr 27 05:36:38 2017
+++ src/sys/net/bpf.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.216.4.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: bpf.c,v 1.216.4.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.4.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.4.2 2017/04/29 11:12:15 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -78,7 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.21
#include <sys/syslog.h>
#include <sys/percpu.h>
#include <sys/pserialize.h>
-#include <sys/localcount.h>
#include <sys/lwp.h>
#include <net/if.h>
Index: src/sys/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.33.6.1 src/sys/net/npf/npf.c:1.33.6.2
--- src/sys/net/npf/npf.c:1.33.6.1 Thu Apr 27 05:36:38 2017
+++ src/sys/net/npf/npf.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.33.6.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: npf.c,v 1.33.6.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.33.6.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.33.6.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.33
#include <sys/conf.h>
#include <sys/kmem.h>
#include <sys/percpu.h>
-#include <sys/localcount.h>
#endif
#include "npf_impl.h"
Index: src/sys/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.49.6.1 src/sys/netsmb/smb_dev.c:1.49.6.2
--- src/sys/netsmb/smb_dev.c:1.49.6.1 Thu Apr 27 05:36:38 2017
+++ src/sys/netsmb/smb_dev.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.49.6.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: smb_dev.c,v 1.49.6.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.49.6.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.49.6.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v
#include <sys/sysctl.h>
#include <sys/uio.h>
#include <sys/vnode.h>
-#include <sys/localcount.h>
#include <miscfs/specfs/specdev.h> /* XXX */
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.89.2.1 src/sys/opencrypto/cryptodev.c:1.89.2.2
--- src/sys/opencrypto/cryptodev.c:1.89.2.1 Thu Apr 27 05:36:38 2017
+++ src/sys/opencrypto/cryptodev.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.89.2.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.89.2.2 2017/04/29 11:12:15 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.89.2.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.89.2.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: cryptodev.c,
#include <sys/atomic.h>
#include <sys/stat.h>
#include <sys/module.h>
-#include <sys/localcount.h>
#ifdef _KERNEL_OPT
#include "opt_ocf.h"
Index: src/sys/rump/librump/rumpvfs/devnull.c
diff -u src/sys/rump/librump/rumpvfs/devnull.c:1.7.8.1 src/sys/rump/librump/rumpvfs/devnull.c:1.7.8.2
--- src/sys/rump/librump/rumpvfs/devnull.c:1.7.8.1 Thu Apr 27 05:36:38 2017
+++ src/sys/rump/librump/rumpvfs/devnull.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: devnull.c,v 1.7.8.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: devnull.c,v 1.7.8.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -33,13 +33,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7.8.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: devnull.c,v 1.7.8.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/stat.h>
-#include <sys/localcount.h>
#include <rump-sys/vfs.h>
Index: src/sys/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.8.1 src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.8.2
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.64.8.1 Thu Apr 27 05:36:38 2017
+++ src/sys/rump/librump/rumpvfs/rumpblk.c Sat Apr 29 11:12:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpblk.c,v 1.64.8.1 2017/04/27 05:36:38 pgoyette Exp $ */
+/* $NetBSD: rumpblk.c,v 1.64.8.2 2017/04/29 11:12:15 pgoyette Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.64.8.1 2017/04/27 05:36:38 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.64.8.2 2017/04/29 11:12:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/cprng.h>
-#include <sys/localcount.h>
#include <rump-sys/kern.h>
#include <rump-sys/vfs.h>
