Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/prg-localcount2]: src Revise previous. Rather than explicitly including...
details: https://anonhg.NetBSD.org/src/rev/f0d9edc1ba87
branches: prg-localcount2
changeset: 823524:f0d9edc1ba87
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Sat Apr 29 10:19:31 2017 +0000
description:
Revise previous. Rather than explicitly including <sys/localcount.h>
in all the places where {b,c}devsw is initialized, just include it
from <sys/conf.h>. This avoids an include-sequence dependancy.
diffstat:
external/cddl/osnet/dev/fbt/fbt.c | 5 +----
external/cddl/osnet/dev/sdt/sdt.c | 5 +----
external/cddl/osnet/dist/uts/common/dtrace/dtrace.c | 3 ---
sys/coda/coda_psdev.c | 5 ++---
sys/dev/clockctl.c | 5 ++---
sys/dev/filemon/filemon.c | 5 ++---
sys/dev/flash/flash.c | 5 ++---
sys/dev/gpio/gpio.c | 5 ++---
sys/dev/hdaudio/hdaudio.c | 5 ++---
sys/dev/i2c/i2c.c | 3 +--
sys/dev/onewire/onewire.c | 5 ++---
sys/dev/tprof/tprof.c | 5 ++---
sys/dist/pf/net/pf_ioctl.c | 5 ++---
sys/external/bsd/drm/dist/bsd-core/drm_drv.c | 1 -
sys/external/bsd/drm2/drm/drm_drv.c | 5 ++---
sys/external/bsd/ipf/netinet/ip_fil_netbsd.c | 7 ++-----
sys/modules/lua/lua.c | 3 +--
sys/net/if_srt.c | 5 ++---
sys/sys/conf.h | 4 ++--
19 files changed, 30 insertions(+), 56 deletions(-)
diffs (truncated from 423 to 300 lines):
diff -r 2df050bf18b4 -r f0d9edc1ba87 external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Sat Apr 29 09:17:58 2017 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.22.2.1 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.22.2.2 2017/04/29 10:19:31 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -35,9 +35,6 @@
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
-#ifdef __NetBSD
-#include <sys/localcount.h>
-#endif
#include <sys/conf.h>
#include <sys/cpuvar.h>
#include <sys/fcntl.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 external/cddl/osnet/dev/sdt/sdt.c
--- a/external/cddl/osnet/dev/sdt/sdt.c Sat Apr 29 09:17:58 2017 +0000
+++ b/external/cddl/osnet/dev/sdt/sdt.c Sat Apr 29 10:19:31 2017 +0000
@@ -39,15 +39,12 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.18.4.1 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.18.4.2 2017/04/29 10:19:31 pgoyette Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
-#ifdef __NetBSD__
-#include <sys/localcount.h>
-#endif
#include <sys/conf.h>
#ifdef __FreeBSD__
#include <sys/eventhandler.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sat Apr 29 09:17:58 2017 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sat Apr 29 10:19:31 2017 +0000
@@ -78,9 +78,6 @@
#include <sys/time.h>
#endif
#include <sys/stat.h>
-#ifdef __NetBSD__
-#include <sys/localcount.h>
-#endif
#include <sys/conf.h>
#include <sys/systm.h>
#if defined(sun)
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/coda/coda_psdev.c
--- a/sys/coda/coda_psdev.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/coda/coda_psdev.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.57.8.1 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.57.8.2 2017/04/29 10:19:31 pgoyette Exp $ */
/*
*
@@ -54,7 +54,7 @@
/* These routines are the device entry points for Venus. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57.8.1 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.57.8.2 2017/04/29 10:19:31 pgoyette Exp $");
extern int coda_nc_initialized; /* Set if cache has been initialized */
@@ -68,7 +68,6 @@
#include <sys/ioctl.h>
#include <sys/poll.h>
#include <sys/select.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/atomic.h>
#include <sys/module.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/clockctl.c
--- a/sys/dev/clockctl.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/clockctl.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.6.2 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.6.3 2017/04/29 10:19:31 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.6.2 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.6.3 2017/04/29 10:19:31 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -43,7 +43,6 @@
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
-#include <sys/localcount.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/conf.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/filemon/filemon.c
--- a/sys/dev/filemon/filemon.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/filemon/filemon.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.c,v 1.28.8.1 2017/04/29 09:17:58 pgoyette Exp $ */
+/* $NetBSD: filemon.c,v 1.28.8.2 2017/04/29 10:19:31 pgoyette Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -25,12 +25,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.28.8.1 2017/04/29 09:17:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.28.8.2 2017/04/29 10:19:31 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/module.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/filedesc.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/flash/flash.c
--- a/sys/dev/flash/flash.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/flash/flash.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.12.18.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: flash.c,v 1.12.18.2 2017/04/29 10:19:31 pgoyette Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.12.18.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.12.18.2 2017/04/29 10:19:31 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -45,7 +45,6 @@
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/device.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/kmem.h>
#include <sys/uio.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/gpio/gpio.c
--- a/sys/dev/gpio/gpio.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/gpio/gpio.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.58.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: gpio.c,v 1.58.8.2 2017/04/29 10:19:31 pgoyette Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.58.8.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.58.8.2 2017/04/29 10:19:31 pgoyette Exp $");
/*
* General Purpose Input/Output framework.
@@ -28,7 +28,6 @@
#include <sys/param.h>
#include <sys/callout.h>
#include <sys/systm.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/fcntl.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/hdaudio/hdaudio.c
--- a/sys/dev/hdaudio/hdaudio.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/hdaudio/hdaudio.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.4.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: hdaudio.c,v 1.4.8.2 2017/04/29 10:19:31 pgoyette Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4.8.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.4.8.2 2017/04/29 10:19:31 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/bus.h>
#include <sys/kmem.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/i2c/i2c.c
--- a/sys/dev/i2c/i2c.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/i2c/i2c.c Sat Apr 29 10:19:31 2017 +0000
@@ -40,13 +40,12 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.54.6.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.54.6.2 2017/04/29 10:19:31 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/event.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/malloc.h>
#include <sys/kmem.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/onewire/onewire.c
--- a/sys/dev/onewire/onewire.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/onewire/onewire.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire.c,v 1.16.18.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: onewire.c,v 1.16.18.2 2017/04/29 10:19:32 pgoyette Exp $ */
/* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.16.18.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.16.18.2 2017/04/29 10:19:32 pgoyette Exp $");
/*
* 1-Wire bus driver.
@@ -26,7 +26,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dev/tprof/tprof.c
--- a/sys/dev/tprof/tprof.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dev/tprof/tprof.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof.c,v 1.13.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: tprof.c,v 1.13.8.2 2017/04/29 10:19:32 pgoyette Exp $ */
/*-
* Copyright (c)2008,2009,2010 YAMAMOTO Takashi,
@@ -27,14 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13.8.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof.c,v 1.13.8.2 2017/04/29 10:19:32 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/callout.h>
#include <sys/kmem.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/dist/pf/net/pf_ioctl.c
--- a/sys/dist/pf/net/pf_ioctl.c Sat Apr 29 09:17:58 2017 +0000
+++ b/sys/dist/pf/net/pf_ioctl.c Sat Apr 29 10:19:31 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.51.8.1 2017/04/29 09:17:59 pgoyette Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.51.8.2 2017/04/29 10:19:32 pgoyette Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.51.8.1 2017/04/29 09:17:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.51.8.2 2017/04/29 10:19:32 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -61,7 +61,6 @@
#include <sys/rwlock.h>
#include <uvm/uvm_extern.h>
#ifdef __NetBSD__
-#include <sys/localcount.h>
#include <sys/conf.h>
#include <sys/lwp.h>
#include <sys/kauth.h>
diff -r 2df050bf18b4 -r f0d9edc1ba87 sys/external/bsd/drm/dist/bsd-core/drm_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sat Apr 29 09:17:58 2017 +0000
Home |
Main Index |
Thread Index |
Old Index