[src/trunk]: src/sys Introduce defflag for NET_MPSAFE

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b829e99e424
branches:  trunk
changeset: 335585:2b829e99e424
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Jan 16 10:36:14 2015 +0000

description:
Introduce defflag for NET_MPSAFE

diffstat:

 sys/conf/files         |  3 ++-
 sys/dev/pci/if_vioif.c |  8 ++++++--
 sys/dev/pci/if_wm.c    |  8 ++++++--
 sys/net/if.c           |  7 +++++--
 sys/net/if_bridgevar.h |  6 +++++-
 sys/net/if_vlan.c      |  7 +++++--
 6 files changed, 29 insertions(+), 10 deletions(-)

diffs (131 lines):

diff -r cbf0fa2f7509 -r 2b829e99e424 sys/conf/files
--- a/sys/conf/files    Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/conf/files    Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1124 2015/01/11 14:22:53 jmcneill Exp $
+#      $NetBSD: files,v 1.1125 2015/01/16 10:36:14 ozaki-r Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20141030
@@ -51,6 +51,7 @@
 defflag        opt_route.h             RTCACHE_DEBUG RTFLUSH_DEBUG
 
 defflag                                MULTIPROCESSOR
+defflag                                NET_MPSAFE
 
 defflag        opt_config.h            INCLUDE_CONFIG_FILE INCLUDE_JUST_CONFIG
 
diff -r cbf0fa2f7509 -r 2b829e99e424 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/dev/pci/if_vioif.c    Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.14 2014/12/25 06:39:26 ozaki-r Exp $    */
+/*     $NetBSD: if_vioif.c,v 1.15 2015/01/16 10:36:14 ozaki-r Exp $    */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.14 2014/12/25 06:39:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.15 2015/01/16 10:36:14 ozaki-r Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_net_mpsafe.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r cbf0fa2f7509 -r 2b829e99e424 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.308 2014/11/16 09:47:35 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.309 2015/01/16 10:36:14 ozaki-r Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.308 2014/11/16 09:47:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.309 2015/01/16 10:36:14 ozaki-r Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_net_mpsafe.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r cbf0fa2f7509 -r 2b829e99e424 sys/net/if.c
--- a/sys/net/if.c      Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/net/if.c      Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.307 2014/12/15 06:52:25 ozaki-r Exp $ */
+/*     $NetBSD: if.c,v 1.308 2015/01/16 10:36:14 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,13 +90,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.307 2014/12/15 06:52:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.308 2015/01/16 10:36:14 ozaki-r Exp $");
 
+#if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 
 #include "opt_atalk.h"
 #include "opt_natm.h"
 #include "opt_wlan.h"
+#include "opt_net_mpsafe.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
diff -r cbf0fa2f7509 -r 2b829e99e424 sys/net/if_bridgevar.h
--- a/sys/net/if_bridgevar.h    Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/net/if_bridgevar.h    Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridgevar.h,v 1.22 2015/01/08 10:47:44 ozaki-r Exp $        */
+/*     $NetBSD: if_bridgevar.h,v 1.23 2015/01/16 10:36:14 ozaki-r Exp $        */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -207,6 +207,10 @@
 #define        ifbrp_filter    ifbrp_ifbrpu.ifbrpu_int32       /* filtering flags */
 
 #ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_net_mpsafe.h"
+#endif /* _KERNEL_OPT */
+
 #include <sys/pserialize.h>
 #include <sys/workqueue.h>
 
diff -r cbf0fa2f7509 -r 2b829e99e424 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Fri Jan 16 10:08:52 2015 +0000
+++ b/sys/net/if_vlan.c Fri Jan 16 10:36:14 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.78 2014/10/11 10:27:31 ozaki-r Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.79 2015/01/16 10:36:14 ozaki-r Exp $     */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,9 +78,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.78 2014/10/11 10:27:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.79 2015/01/16 10:36:14 ozaki-r Exp $");
 
+#ifdef _KERNEL_OPT
 #include "opt_inet.h"
+#include "opt_net_mpsafe.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/kernel.h>