Module Name: src
Committed By: pooka
Date: Mon Aug 24 22:50:33 UTC 2015
Modified Files:
src/sys/compat/common: rtsock_50.c
src/sys/conf: param.c
src/sys/dev/scsipi: scsipi_ioctl.c
src/sys/dev/sysmon: sysmon_power.c
src/sys/dev/wscons: wsdisplay.c wsdisplay_compat_usl.c
wsdisplay_glyphcache.c wsemul_vt100.c wsevent.c wskbd.c wsmux.c
src/sys/kern: kern_prot.c kern_stub.c kern_sysctl.c subr_extent.c
subr_kobj.c subr_kobj_vfs.c subr_pool.c subr_prf.c subr_vmem.c
sys_module.c tty.c tty_ptm.c vfs_bio.c vfs_cache.c vfs_lookup.c
vfs_subr.c vfs_trans.c
src/sys/uvm: uvm_aobj.c uvm_object.c uvm_vnode.c
Log Message:
to garnish, dust with _KERNEL_OPT
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.65 -r1.66 src/sys/conf/param.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/scsipi/scsipi_ioctl.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.138 -r1.139 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wscons/wsdisplay_compat_usl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/wscons/wsdisplay_glyphcache.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/wscons/wsemul_vt100.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/wscons/wsmux.c
cvs rdiff -u -r1.118 -r1.119 src/sys/kern/kern_prot.c
cvs rdiff -u -r1.40 -r1.41 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.256 -r1.257 src/sys/kern/kern_sysctl.c
cvs rdiff -u -r1.78 -r1.79 src/sys/kern/subr_extent.c
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/subr_kobj.c
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_kobj_vfs.c
cvs rdiff -u -r1.204 -r1.205 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.18 -r1.19 src/sys/kern/sys_module.c
cvs rdiff -u -r1.265 -r1.266 src/sys/kern/tty.c
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.255 -r1.256 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.106 -r1.107 src/sys/kern/vfs_cache.c
cvs rdiff -u -r1.202 -r1.203 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.447 -r1.448 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/vfs_trans.c
cvs rdiff -u -r1.122 -r1.123 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.12 -r1.13 src/sys/uvm/uvm_object.c
cvs rdiff -u -r1.99 -r1.100 src/sys/uvm/uvm_vnode.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/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.3 src/sys/compat/common/rtsock_50.c:1.4
--- src/sys/compat/common/rtsock_50.c:1.3 Tue Feb 1 01:39:19 2011
+++ src/sys/compat/common/rtsock_50.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.3 2011/02/01 01:39:19 matt Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.4 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,9 +61,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.3 2011/02/01 01:39:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.4 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
+#endif
#if defined(COMPAT_14) && !defined(COMPAT_50)
#define COMPAT_50 1 /* 1.4 needs 5.0 */
Index: src/sys/conf/param.c
diff -u src/sys/conf/param.c:1.65 src/sys/conf/param.c:1.66
--- src/sys/conf/param.c:1.65 Wed May 13 02:06:25 2015
+++ src/sys/conf/param.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: param.c,v 1.65 2015/05/13 02:06:25 pgoyette Exp $ */
+/* $NetBSD: param.c,v 1.66 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1980, 1986, 1989 Regents of the University of California.
@@ -37,13 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.65 2015/05/13 02:06:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.66 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_hz.h"
#include "opt_rtc_offset.h"
#include "opt_sysv.h"
#include "opt_sysvparam.h"
#include "opt_multiprocessor.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/scsipi/scsipi_ioctl.c
diff -u src/sys/dev/scsipi/scsipi_ioctl.c:1.67 src/sys/dev/scsipi/scsipi_ioctl.c:1.68
--- src/sys/dev/scsipi/scsipi_ioctl.c:1.67 Thu Apr 19 17:45:20 2012
+++ src/sys/dev/scsipi/scsipi_ioctl.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $ */
+/* $NetBSD: scsipi_ioctl.c,v 1.68 2015/08/24 22:50:33 pooka Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,10 +37,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.67 2012/04/19 17:45:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.68 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/param.h>
#include <sys/errno.h>
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.55 src/sys/dev/sysmon/sysmon_power.c:1.56
--- src/sys/dev/sysmon/sysmon_power.c:1.55 Sat Apr 25 23:40:09 2015
+++ src/sys/dev/sysmon/sysmon_power.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.55 2015/04/25 23:40:09 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.56 2015/08/24 22:50:33 pooka Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,9 +69,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.55 2015/04/25 23:40:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.56 2015/08/24 22:50:33 pooka Exp $");
-#ifndef _LKM
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#endif
Index: src/sys/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.138 src/sys/dev/wscons/wsdisplay.c:1.139
--- src/sys/dev/wscons/wsdisplay.c:1.138 Fri Jul 25 08:10:39 2014
+++ src/sys/dev/wscons/wsdisplay.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.138 2014/07/25 08:10:39 dholland Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.139 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,10 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.138 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.139 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
+#endif
+
#include "wskbd.h"
#include "wsmux.h"
#include "wsdisplay.h"
Index: src/sys/dev/wscons/wsdisplay_compat_usl.c
diff -u src/sys/dev/wscons/wsdisplay_compat_usl.c:1.48 src/sys/dev/wscons/wsdisplay_compat_usl.c:1.49
--- src/sys/dev/wscons/wsdisplay_compat_usl.c:1.48 Tue Feb 19 15:21:08 2013
+++ src/sys/dev/wscons/wsdisplay_compat_usl.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.48 2013/02/19 15:21:08 macallan Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.49 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1998
@@ -27,10 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.48 2013/02/19 15:21:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.49 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/wscons/wsdisplay_glyphcache.c
diff -u src/sys/dev/wscons/wsdisplay_glyphcache.c:1.6 src/sys/dev/wscons/wsdisplay_glyphcache.c:1.7
--- src/sys/dev/wscons/wsdisplay_glyphcache.c:1.6 Mon Jan 13 19:30:33 2014
+++ src/sys/dev/wscons/wsdisplay_glyphcache.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_glyphcache.c,v 1.6 2014/01/13 19:30:33 macallan Exp $ */
+/* $NetBSD: wsdisplay_glyphcache.c,v 1.7 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@@ -31,13 +31,16 @@
* the most commonly used glyphs ) but the API should at least not prevent
* more sophisticated caching algorithms
*/
+
+#ifdef _KERNEL_OPT
+#include "opt_glyphcache.h"
+#endif
#include <sys/systm.h>
#include <sys/atomic.h>
#include <sys/errno.h>
#include <sys/kmem.h>
#include <dev/wscons/wsdisplay_glyphcachevar.h>
-#include "opt_glyphcache.h"
#ifdef GLYPHCACHE_DEBUG
#define DPRINTF aprint_normal
Index: src/sys/dev/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.36 src/sys/dev/wscons/wsemul_vt100.c:1.37
--- src/sys/dev/wscons/wsemul_vt100.c:1.36 Sat Oct 19 21:01:39 2013
+++ src/sys/dev/wscons/wsemul_vt100.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.36 2013/10/19 21:01:39 mrg Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.37 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1998
@@ -27,9 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.36 2013/10/19 21:01:39 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.37 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_wsmsgattrs.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.35 src/sys/dev/wscons/wsevent.c:1.36
--- src/sys/dev/wscons/wsevent.c:1.35 Thu May 24 18:16:31 2012
+++ src/sys/dev/wscons/wsevent.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.35 2012/05/24 18:16:31 abs Exp $ */
+/* $NetBSD: wsevent.c,v 1.36 2015/08/24 22:50:33 pooka Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,10 +104,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.35 2012/05/24 18:16:31 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.36 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.135 src/sys/dev/wscons/wskbd.c:1.136
--- src/sys/dev/wscons/wskbd.c:1.135 Sun Nov 16 16:20:01 2014
+++ src/sys/dev/wscons/wskbd.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.135 2014/11/16 16:20:01 ozaki-r Exp $ */
+/* $NetBSD: wskbd.c,v 1.136 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,11 +105,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.135 2014/11/16 16:20:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.136 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_wsdisplay_compat.h"
+#endif
#include "wsdisplay.h"
#include "wskbd.h"
Index: src/sys/dev/wscons/wsmux.c
diff -u src/sys/dev/wscons/wsmux.c:1.59 src/sys/dev/wscons/wsmux.c:1.60
--- src/sys/dev/wscons/wsmux.c:1.59 Thu Aug 20 14:40:18 2015
+++ src/sys/dev/wscons/wsmux.c Mon Aug 24 22:50:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $ */
+/* $NetBSD: wsmux.c,v 1.60 2015/08/24 22:50:33 pooka Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -37,10 +37,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.59 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.60 2015/08/24 22:50:33 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
+#endif
#include "wsdisplay.h"
#include "wsmux.h"
Index: src/sys/kern/kern_prot.c
diff -u src/sys/kern/kern_prot.c:1.118 src/sys/kern/kern_prot.c:1.119
--- src/sys/kern/kern_prot.c:1.118 Mon Oct 20 08:20:08 2014
+++ src/sys/kern/kern_prot.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_prot.c,v 1.118 2014/10/20 08:20:08 maxv Exp $ */
+/* $NetBSD: kern_prot.c,v 1.119 2015/08/24 22:50:32 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
@@ -41,9 +41,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.118 2014/10/20 08:20:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.119 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_43.h"
+#endif
#include <sys/param.h>
#include <sys/acct.h>
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.40 src/sys/kern/kern_stub.c:1.41
--- src/sys/kern/kern_stub.c:1.40 Mon Aug 17 06:16:03 2015
+++ src/sys/kern/kern_stub.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.40 2015/08/17 06:16:03 knakahara Exp $ */
+/* $NetBSD: kern_stub.c,v 1.41 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,10 +62,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.40 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.41 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
#include "opt_ktrace.h"
+#endif
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.256 src/sys/kern/kern_sysctl.c:1.257
--- src/sys/kern/kern_sysctl.c:1.256 Tue Apr 14 12:18:37 2015
+++ src/sys/kern/kern_sysctl.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.256 2015/04/14 12:18:37 riastradh Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.257 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,9 +68,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.256 2015/04/14 12:18:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.257 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
+#endif
+
#include "ksyms.h"
#include <sys/param.h>
Index: src/sys/kern/subr_extent.c
diff -u src/sys/kern/subr_extent.c:1.78 src/sys/kern/subr_extent.c:1.79
--- src/sys/kern/subr_extent.c:1.78 Tue Jul 28 19:48:12 2015
+++ src/sys/kern/subr_extent.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_extent.c,v 1.78 2015/07/28 19:48:12 christos Exp $ */
+/* $NetBSD: subr_extent.c,v 1.79 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 1996, 1998, 2007 The NetBSD Foundation, Inc.
@@ -34,10 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.78 2015/07/28 19:48:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_extent.c,v 1.79 2015/08/24 22:50:32 pooka Exp $");
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
+#endif
#include <sys/param.h>
#include <sys/extent.h>
Index: src/sys/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.50 src/sys/kern/subr_kobj.c:1.51
--- src/sys/kern/subr_kobj.c:1.50 Wed Jul 16 13:26:33 2014
+++ src/sys/kern/subr_kobj.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.50 2014/07/16 13:26:33 maxv Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.51 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,9 +63,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.50 2014/07/16 13:26:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.51 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_modular.h"
+#endif
#include <sys/kobj_impl.h>
Index: src/sys/kern/subr_kobj_vfs.c
diff -u src/sys/kern/subr_kobj_vfs.c:1.7 src/sys/kern/subr_kobj_vfs.c:1.8
--- src/sys/kern/subr_kobj_vfs.c:1.7 Sun Sep 15 14:08:25 2013
+++ src/sys/kern/subr_kobj_vfs.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj_vfs.c,v 1.7 2013/09/15 14:08:25 martin Exp $ */
+/* $NetBSD: subr_kobj_vfs.c,v 1.8 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,10 @@
*/
#include <sys/kobj_impl.h>
+
+#ifdef _KERNEL_OPT
#include "opt_modular.h"
+#endif
#ifdef MODULAR
@@ -72,7 +75,7 @@
#include <sys/vnode.h>
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj_vfs.c,v 1.7 2013/09/15 14:08:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj_vfs.c,v 1.8 2015/08/24 22:50:32 pooka Exp $");
static void
kobj_close_vfs(kobj_t ko)
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.204 src/sys/kern/subr_pool.c:1.205
--- src/sys/kern/subr_pool.c:1.204 Tue Jul 28 12:32:44 2015
+++ src/sys/kern/subr_pool.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.204 2015/07/28 12:32:44 maxv Exp $ */
+/* $NetBSD: subr_pool.c,v 1.205 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015
@@ -33,10 +33,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.204 2015/07/28 12:32:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.205 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_lockdebug.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.158 src/sys/kern/subr_prf.c:1.159
--- src/sys/kern/subr_prf.c:1.158 Mon Apr 13 16:46:33 2015
+++ src/sys/kern/subr_prf.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.158 2015/04/13 16:46:33 riastradh Exp $ */
+/* $NetBSD: subr_prf.c,v 1.159 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,13 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.158 2015/04/13 16:46:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.159 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_ipkdb.h"
#include "opt_kgdb.h"
#include "opt_dump.h"
#include "opt_rnd_printf.h"
+#endif
#include <sys/param.h>
#include <sys/stdint.h>
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.92 src/sys/kern/subr_vmem.c:1.93
--- src/sys/kern/subr_vmem.c:1.92 Wed Apr 2 18:09:10 2014
+++ src/sys/kern/subr_vmem.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.92 2014/04/02 18:09:10 para Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.93 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -46,11 +46,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.92 2014/04/02 18:09:10 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.93 2015/08/24 22:50:32 pooka Exp $");
-#if defined(_KERNEL)
+#if defined(_KERNEL) && defined(_KERNEL_OPT)
#include "opt_ddb.h"
-#endif /* defined(_KERNEL) */
+#endif /* defined(_KERNEL) && defined(_KERNEL_OPT) */
#include <sys/param.h>
#include <sys/hash.h>
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.18 src/sys/kern/sys_module.c:1.19
--- src/sys/kern/sys_module.c:1.18 Fri Jun 19 14:23:59 2015
+++ src/sys/kern/sys_module.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.18 2015/06/19 14:23:59 martin Exp $ */
+/* $NetBSD: sys_module.c,v 1.19 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.18 2015/06/19 14:23:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.19 2015/08/24 22:50:32 pooka Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_modular.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: sys_module.c
#include <sys/syscall.h>
#include <sys/syscallargs.h>
-#include <opt_modular.h>
-
/*
* Arbitrary limit to avoid DoS for excessive memory allocation.
*/
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.265 src/sys/kern/tty.c:1.266
--- src/sys/kern/tty.c:1.265 Wed Aug 19 12:02:55 2015
+++ src/sys/kern/tty.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.265 2015/08/19 12:02:55 gson Exp $ */
+/* $NetBSD: tty.c,v 1.266 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,9 +63,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.265 2015/08/19 12:02:55 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.266 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
+#endif
#define TTY_ALLOW_PRIVATE
Index: src/sys/kern/tty_ptm.c
diff -u src/sys/kern/tty_ptm.c:1.36 src/sys/kern/tty_ptm.c:1.37
--- src/sys/kern/tty_ptm.c:1.36 Thu Aug 20 09:45:45 2015
+++ src/sys/kern/tty_ptm.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $ */
+/* $NetBSD: tty_ptm.c,v 1.37 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,10 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.36 2015/08/20 09:45:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.37 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_ptm.h"
+#endif
/* pty multiplexor driver /dev/ptm{,x} */
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.255 src/sys/kern/vfs_bio.c:1.256
--- src/sys/kern/vfs_bio.c:1.255 Sat Mar 28 19:24:04 2015
+++ src/sys/kern/vfs_bio.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.255 2015/03/28 19:24:04 maxv Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.256 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,9 +123,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.255 2015/03/28 19:24:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.256 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.106 src/sys/kern/vfs_cache.c:1.107
--- src/sys/kern/vfs_cache.c:1.106 Mon Apr 20 13:44:16 2015
+++ src/sys/kern/vfs_cache.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.106 2015/04/20 13:44:16 riastradh Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.107 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,10 +58,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.106 2015/04/20 13:44:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.107 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_revcache.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.202 src/sys/kern/vfs_lookup.c:1.203
--- src/sys/kern/vfs_lookup.c:1.202 Tue Apr 21 03:19:03 2015
+++ src/sys/kern/vfs_lookup.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.202 2015/04/21 03:19:03 riastradh Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.203 2015/08/24 22:50:32 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,9 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.202 2015/04/21 03:19:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.203 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.447 src/sys/kern/vfs_subr.c:1.448
--- src/sys/kern/vfs_subr.c:1.447 Tue Jun 23 10:42:34 2015
+++ src/sys/kern/vfs_subr.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.447 2015/06/23 10:42:34 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.448 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,11 +68,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.447 2015/06/23 10:42:34 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.448 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
#include "opt_compat_43.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/kern/vfs_trans.c
diff -u src/sys/kern/vfs_trans.c:1.33 src/sys/kern/vfs_trans.c:1.34
--- src/sys/kern/vfs_trans.c:1.33 Wed May 6 15:57:08 2015
+++ src/sys/kern/vfs_trans.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_trans.c,v 1.33 2015/05/06 15:57:08 hannken Exp $ */
+/* $NetBSD: vfs_trans.c,v 1.34 2015/08/24 22:50:32 pooka Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.33 2015/05/06 15:57:08 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.34 2015/08/24 22:50:32 pooka Exp $");
/*
* File system transaction operations.
*/
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.122 src/sys/uvm/uvm_aobj.c:1.123
--- src/sys/uvm/uvm_aobj.c:1.122 Sun May 25 18:55:11 2014
+++ src/sys/uvm/uvm_aobj.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.122 2014/05/25 18:55:11 riastradh Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.123 2015/08/24 22:50:32 pooka Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,9 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.122 2014/05/25 18:55:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.123 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/uvm/uvm_object.c
diff -u src/sys/uvm/uvm_object.c:1.12 src/sys/uvm/uvm_object.c:1.13
--- src/sys/uvm/uvm_object.c:1.12 Tue Mar 11 20:22:47 2014
+++ src/sys/uvm/uvm_object.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $ */
+/* $NetBSD: uvm_object.c,v 1.13 2015/08/24 22:50:32 pooka Exp $ */
/*
* Copyright (c) 2006, 2010 The NetBSD Foundation, Inc.
@@ -37,9 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.13 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <sys/mutex.h>
Index: src/sys/uvm/uvm_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.99 src/sys/uvm/uvm_vnode.c:1.100
--- src/sys/uvm/uvm_vnode.c:1.99 Mon Jul 30 23:56:48 2012
+++ src/sys/uvm/uvm_vnode.c Mon Aug 24 22:50:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.99 2012/07/30 23:56:48 matt Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.100 2015/08/24 22:50:32 pooka Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,9 +45,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.99 2012/07/30 23:56:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.100 2015/08/24 22:50:32 pooka Exp $");
+#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
