Module Name: src
Committed By: ozaki-r
Date: Fri Jan 16 10:36:14 UTC 2015
Modified Files:
src/sys/conf: files
src/sys/dev/pci: if_vioif.c if_wm.c
src/sys/net: if.c if_bridgevar.h if_vlan.c
Log Message:
Introduce defflag for NET_MPSAFE
To generate a diff of this commit:
cvs rdiff -u -r1.1124 -r1.1125 src/sys/conf/files
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.308 -r1.309 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.307 -r1.308 src/sys/net/if.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/if_bridgevar.h
cvs rdiff -u -r1.78 -r1.79 src/sys/net/if_vlan.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/conf/files
diff -u src/sys/conf/files:1.1124 src/sys/conf/files:1.1125
--- src/sys/conf/files:1.1124 Sun Jan 11 14:22:53 2015
+++ src/sys/conf/files Fri Jan 16 10:36:14 2015
@@ -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_sosend_loan.h SOSEND_NO_LOAN
defflag opt_route.h RTCACHE_DEBUG RTFLUSH_DEBUG
defflag MULTIPROCESSOR
+defflag NET_MPSAFE
defflag opt_config.h INCLUDE_CONFIG_FILE INCLUDE_JUST_CONFIG
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.14 src/sys/dev/pci/if_vioif.c:1.15
--- src/sys/dev/pci/if_vioif.c:1.14 Thu Dec 25 06:39:26 2014
+++ src/sys/dev/pci/if_vioif.c Fri Jan 16 10:36:14 2015
@@ -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>
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.308 src/sys/dev/pci/if_wm.c:1.309
--- src/sys/dev/pci/if_wm.c:1.308 Sun Nov 16 09:47:35 2014
+++ src/sys/dev/pci/if_wm.c Fri Jan 16 10:36:14 2015
@@ -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>
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.307 src/sys/net/if.c:1.308
--- src/sys/net/if.c:1.307 Mon Dec 15 06:52:25 2014
+++ src/sys/net/if.c Fri Jan 16 10:36:14 2015
@@ -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>
Index: src/sys/net/if_bridgevar.h
diff -u src/sys/net/if_bridgevar.h:1.22 src/sys/net/if_bridgevar.h:1.23
--- src/sys/net/if_bridgevar.h:1.22 Thu Jan 8 10:47:44 2015
+++ src/sys/net/if_bridgevar.h Fri Jan 16 10:36:14 2015
@@ -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 @@ struct ifbrparam {
#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>
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.78 src/sys/net/if_vlan.c:1.79
--- src/sys/net/if_vlan.c:1.78 Sat Oct 11 10:27:31 2014
+++ src/sys/net/if_vlan.c Fri Jan 16 10:36:14 2015
@@ -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>
