Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys sprinkle _KERNEL_OPT



details:   https://anonhg.NetBSD.org/src/rev/4875d9ac2948
branches:  trunk
changeset: 340150:4875d9ac2948
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 22:21:26 2015 +0000

description:
sprinkle _KERNEL_OPT

diffstat:

 sys/kern/uipc_mbuf.c            |  6 ++++--
 sys/kern/uipc_socket.c          |  6 ++++--
 sys/kern/uipc_socket2.c         |  6 ++++--
 sys/kern/uipc_syscalls.c        |  6 ++++--
 sys/net/agr/if_agr.c            |  6 ++++--
 sys/net/agr/if_agrsubr.c        |  6 ++++--
 sys/net/if_arcsubr.c            |  7 ++++---
 sys/net/if_atmsubr.c            |  7 ++++---
 sys/net/if_ecosubr.c            |  6 ++++--
 sys/net/if_etherip.c            |  6 ++++--
 sys/net/if_ethersubr.c          |  7 +++++--
 sys/net/if_fddisubr.c           |  6 ++++--
 sys/net/if_gif.c                |  6 ++++--
 sys/net/if_gre.c                |  6 ++++--
 sys/net/if_hippisubr.c          |  6 ++++--
 sys/net/if_ieee1394subr.c       |  6 ++++--
 sys/net/if_loop.c               |  6 ++++--
 sys/net/if_mpls.c               |  6 ++++--
 sys/net/if_ppp.c                |  6 ++++--
 sys/net/if_pppoe.c              |  7 +++++--
 sys/net/if_sl.c                 |  6 ++++--
 sys/net/if_srt.c                |  6 ++++--
 sys/net/if_stf.c                |  7 +++++--
 sys/net/if_strip.c              |  6 ++++--
 sys/net/if_tokensubr.c          |  7 ++++---
 sys/net/if_tun.c                |  6 ++++--
 sys/net/ppp_tty.c               |  6 ++++--
 sys/net/radix.c                 |  6 ++++--
 sys/net/route.c                 |  6 ++++--
 sys/net/rtbl.c                  |  8 ++++----
 sys/net/slcompress.c            |  7 +++++--
 sys/net80211/ieee80211.c        |  6 ++++--
 sys/net80211/ieee80211_crypto.c |  6 ++++--
 sys/net80211/ieee80211_input.c  |  6 ++++--
 sys/net80211/ieee80211_ioctl.c  |  6 ++++--
 sys/net80211/ieee80211_node.c   |  6 ++++--
 sys/net80211/ieee80211_output.c |  6 ++++--
 sys/net80211/ieee80211_proto.c  |  6 ++++--
 sys/netinet/dccp_cc_sw.c        |  6 ++++--
 sys/netinet/dccp_tcplike.c      |  6 ++++--
 sys/netinet/dccp_tfrc.c         |  6 ++++--
 sys/netinet/dccp_usrreq.c       |  8 +++++---
 sys/netinet/if_arp.c            |  6 ++++--
 sys/netinet/if_atm.c            |  6 ++++--
 sys/netinet/igmp.c              |  6 ++++--
 sys/netinet/in.c                |  7 +++++--
 sys/netinet/in_gif.c            |  6 ++++--
 sys/netinet/in_pcb.c            |  6 ++++--
 sys/netinet/in_proto.c          |  6 ++++--
 sys/netinet/in_selsrc.c         |  6 ++++--
 sys/netinet/ip_carp.c           |  6 ++++--
 sys/netinet/ip_ecn.c            |  6 ++++--
 sys/netinet/ip_encap.c          |  6 ++++--
 sys/netinet/ip_etherip.c        |  6 ++++--
 sys/netinet/ip_icmp.c           |  6 ++++--
 sys/netinet/ip_input.c          |  6 ++++--
 sys/netinet/ip_mroute.c         |  8 +++++---
 sys/netinet/ip_output.c         |  6 ++++--
 sys/netinet/portalgo.c          |  6 ++++--
 sys/netinet/raw_ip.c            |  6 ++++--
 sys/netinet/tcp_congctl.c       |  6 ++++--
 sys/netinet/tcp_debug.c         |  6 ++++--
 sys/netinet/tcp_input.c         |  8 +++++---
 sys/netinet/tcp_output.c        |  6 ++++--
 sys/netinet/tcp_sack.c          |  6 ++++--
 sys/netinet/tcp_subr.c          |  6 ++++--
 sys/netinet/tcp_timer.c         |  6 ++++--
 sys/netinet/tcp_usrreq.c        |  9 +++++----
 sys/netinet/tcp_vtw.c           |  4 +++-
 sys/netinet/udp_usrreq.c        |  6 ++++--
 sys/netinet6/dccp6_usrreq.c     |  6 ++++--
 sys/netinet6/icmp6.c            |  6 ++++--
 sys/netinet6/in6.c              |  6 ++++--
 sys/netinet6/in6_gif.c          |  6 ++++--
 sys/netinet6/in6_pcb.c          |  6 ++++--
 sys/netinet6/in6_proto.c        |  6 ++++--
 sys/netinet6/in6_src.c          |  6 ++++--
 sys/netinet6/ip6_etherip.c      |  6 ++++--
 sys/netinet6/ip6_forward.c      |  6 ++++--
 sys/netinet6/ip6_input.c        |  6 ++++--
 sys/netinet6/ip6_mroute.c       |  6 ++++--
 sys/netinet6/ip6_output.c       |  8 +++++---
 sys/netinet6/mld6.c             |  6 ++++--
 sys/netinet6/nd6.c              |  6 ++++--
 sys/netinet6/nd6_nbr.c          |  6 ++++--
 sys/netinet6/raw_ip6.c          |  6 ++++--
 sys/netinet6/udp6_output.c      |  6 ++++--
 sys/netinet6/udp6_usrreq.c      |  6 ++++--
 sys/netmpls/mpls_proto.c        |  6 ++++--
 sys/netmpls/mpls_ttl.c          |  6 ++++--
 sys/netmpls/mpls_var.h          |  4 +++-
 91 files changed, 372 insertions(+), 191 deletions(-)

diffs (truncated from 2165 to 300 lines):

diff -r 0a6c352662b7 -r 4875d9ac2948 sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/kern/uipc_mbuf.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_mbuf.c,v 1.162 2015/07/24 12:29:55 maxv Exp $     */
+/*     $NetBSD: uipc_mbuf.c,v 1.163 2015/08/24 22:21:26 pooka Exp $    */
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,11 +62,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.162 2015/07/24 12:29:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.163 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/kern/uipc_socket.c    Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.245 2015/05/09 15:22:47 rtr Exp $    */
+/*     $NetBSD: uipc_socket.c,v 1.246 2015/08/24 22:21:26 pooka Exp $  */
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,14 +71,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.245 2015/05/09 15:22:47 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.246 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
 #include "opt_somaxkva.h"
 #include "opt_multiprocessor.h"        /* XXX */
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/kern/uipc_socket2.c
--- a/sys/kern/uipc_socket2.c   Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/kern/uipc_socket2.c   Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket2.c,v 1.121 2014/09/05 05:57:21 matt Exp $  */
+/*     $NetBSD: uipc_socket2.c,v 1.122 2015/08/24 22:21:26 pooka Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,10 +58,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.121 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.122 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_sb_max.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c  Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/kern/uipc_syscalls.c  Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $ */
+/*     $NetBSD: uipc_syscalls.c,v 1.180 2015/08/24 22:21:26 pooka Exp $        */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,9 +61,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.180 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_pipe.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/agr/if_agr.c
--- a/sys/net/agr/if_agr.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/agr/if_agr.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $     */
+/*     $NetBSD: if_agr.c,v 1.33 2015/08/24 22:21:26 pooka Exp $        */
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.32 2015/08/20 14:40:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.33 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/callout.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/agr/if_agrsubr.c
--- a/sys/net/agr/if_agrsubr.c  Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/agr/if_agrsubr.c  Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_agrsubr.c,v 1.9 2010/01/19 22:08:17 pooka Exp $     */
+/*     $NetBSD: if_agrsubr.c,v 1.10 2015/08/24 22:21:26 pooka Exp $    */
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,9 +27,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agrsubr.c,v 1.9 2010/01/19 22:08:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agrsubr.c,v 1.10 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/callout.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_arcsubr.c
--- a/sys/net/if_arcsubr.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_arcsubr.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_arcsubr.c,v 1.67 2015/06/04 09:19:59 ozaki-r Exp $  */
+/*     $NetBSD: if_arcsubr.c,v 1.68 2015/08/24 22:21:26 pooka Exp $    */
 
 /*
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -35,10 +35,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.67 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arcsubr.c,v 1.68 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
-
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_atmsubr.c
--- a/sys/net/if_atmsubr.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_atmsubr.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_atmsubr.c,v 1.53 2015/06/04 09:19:59 ozaki-r Exp $       */
+/*      $NetBSD: if_atmsubr.c,v 1.54 2015/08/24 22:21:26 pooka Exp $       */
 
 /*
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,12 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.53 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atmsubr.c,v 1.54 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include "opt_natm.h"
-
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_ecosubr.c
--- a/sys/net/if_ecosubr.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_ecosubr.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ecosubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $  */
+/*     $NetBSD: if_ecosubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $    */
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -58,9 +58,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.43 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.44 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/errno.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_etherip.c
--- a/sys/net/if_etherip.c      Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_etherip.c      Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $        */
+/*      $NetBSD: if_etherip.c,v 1.37 2015/08/24 22:21:26 pooka Exp $        */
 
 /*
  *  Copyright (c) 2006, Hans Rosenfeld <rosenfeld%grumpf.hope-2000.org@localhost>
@@ -86,9 +86,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.36 2015/08/20 14:40:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.37 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_ethersubr.c    Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.211 2015/08/12 02:20:31 ozaki-r Exp $       */
+/*     $NetBSD: if_ethersubr.c,v 1.212 2015/08/24 22:21:26 pooka Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,8 +61,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.211 2015/08/12 02:20:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.212 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
@@ -70,6 +71,8 @@
 #include "opt_gateway.h"
 #include "opt_pppoe.h"
 #include "opt_net_mpsafe.h"
+#endif
+
 #include "vlan.h"
 #include "pppoe.h"
 #include "bridge.h"
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_fddisubr.c
--- a/sys/net/if_fddisubr.c     Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_fddisubr.c     Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fddisubr.c,v 1.92 2015/06/04 09:19:59 ozaki-r Exp $ */
+/*     $NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,12 +96,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.92 2015/06/04 09:19:59 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.93 2015/08/24 22:21:26 pooka Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_gateway.h"
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
+#endif
 
 
 #include <sys/param.h>
diff -r 0a6c352662b7 -r 4875d9ac2948 sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Aug 24 20:58:47 2015 +0000
+++ b/sys/net/if_gif.c  Mon Aug 24 22:21:26 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $     */
+/*     $NetBSD: if_gif.c,v 1.88 2015/08/24 22:21:26 pooka Exp $        */
 /*     $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $    */
 
 /*
@@ -31,9 +31,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.87 2015/08/20 14:40:19 christos Exp $");



Home | Main Index | Thread Index | Old Index