Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys to garnish, dust with _KERNEL_OPT
details: https://anonhg.NetBSD.org/src/rev/530b13908582
branches: trunk
changeset: 340153:530b13908582
user: pooka <pooka%NetBSD.org@localhost>
date: Mon Aug 24 22:50:32 2015 +0000
description:
to garnish, dust with _KERNEL_OPT
diffstat:
sys/compat/common/rtsock_50.c | 6 ++++--
sys/conf/param.c | 6 ++++--
sys/dev/scsipi/scsipi_ioctl.c | 6 ++++--
sys/dev/sysmon/sysmon_power.c | 6 +++---
sys/dev/wscons/wsdisplay.c | 7 +++++--
sys/dev/wscons/wsdisplay_compat_usl.c | 6 ++++--
sys/dev/wscons/wsdisplay_glyphcache.c | 7 +++++--
sys/dev/wscons/wsemul_vt100.c | 6 ++++--
sys/dev/wscons/wsevent.c | 6 ++++--
sys/dev/wscons/wskbd.c | 6 ++++--
sys/dev/wscons/wsmux.c | 6 ++++--
sys/kern/kern_prot.c | 6 ++++--
sys/kern/kern_stub.c | 6 ++++--
sys/kern/kern_sysctl.c | 7 +++++--
sys/kern/subr_extent.c | 6 ++++--
sys/kern/subr_kobj.c | 6 ++++--
sys/kern/subr_kobj_vfs.c | 7 +++++--
sys/kern/subr_pool.c | 8 +++++---
sys/kern/subr_prf.c | 6 ++++--
sys/kern/subr_vmem.c | 8 ++++----
sys/kern/sys_module.c | 10 ++++++----
sys/kern/tty.c | 6 ++++--
sys/kern/tty_ptm.c | 6 ++++--
sys/kern/vfs_bio.c | 6 ++++--
sys/kern/vfs_cache.c | 6 ++++--
sys/kern/vfs_lookup.c | 6 ++++--
sys/kern/vfs_subr.c | 6 ++++--
sys/kern/vfs_trans.c | 6 ++++--
sys/uvm/uvm_aobj.c | 6 ++++--
sys/uvm/uvm_object.c | 6 ++++--
sys/uvm/uvm_vnode.c | 6 ++++--
31 files changed, 130 insertions(+), 68 deletions(-)
diffs (truncated from 733 to 300 lines):
diff -r 9007698bb772 -r 530b13908582 sys/compat/common/rtsock_50.c
--- a/sys/compat/common/rtsock_50.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/compat/common/rtsock_50.c Mon Aug 24 22:50:32 2015 +0000
@@ -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 */
diff -r 9007698bb772 -r 530b13908582 sys/conf/param.c
--- a/sys/conf/param.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/conf/param.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/dev/scsipi/scsipi_ioctl.c
--- a/sys/dev/scsipi/scsipi_ioctl.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/scsipi/scsipi_ioctl.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/dev/sysmon/sysmon_power.c
--- a/sys/dev/sysmon/sysmon_power.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/sysmon/sysmon_power.c Mon Aug 24 22:50:32 2015 +0000
@@ -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
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsdisplay.c Mon Aug 24 22:50:32 2015 +0000
@@ -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"
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsdisplay_compat_usl.c
--- a/sys/dev/wscons/wsdisplay_compat_usl.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsdisplay_glyphcache.c
--- a/sys/dev/wscons/wsdisplay_glyphcache.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsdisplay_glyphcache.c Mon Aug 24 22:50:32 2015 +0000
@@ -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
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsemul_vt100.c
--- a/sys/dev/wscons/wsemul_vt100.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsemul_vt100.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsevent.c
--- a/sys/dev/wscons/wsevent.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsevent.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wskbd.c Mon Aug 24 22:50:32 2015 +0000
@@ -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"
diff -r 9007698bb772 -r 530b13908582 sys/dev/wscons/wsmux.c
--- a/sys/dev/wscons/wsmux.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/dev/wscons/wsmux.c Mon Aug 24 22:50:32 2015 +0000
@@ -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"
diff -r 9007698bb772 -r 530b13908582 sys/kern/kern_prot.c
--- a/sys/kern/kern_prot.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/kern/kern_prot.c Mon Aug 24 22:50:32 2015 +0000
@@ -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>
diff -r 9007698bb772 -r 530b13908582 sys/kern/kern_stub.c
--- a/sys/kern/kern_stub.c Mon Aug 24 22:31:33 2015 +0000
+++ b/sys/kern/kern_stub.c Mon Aug 24 22:50:32 2015 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index