CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb
Module Name:src
Committed By: jmcneill
Date: Mon Oct 19 23:31:26 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb:
nouveau_subdev_fb_ramgk20a.c
Log Message:
map stolen memory with BUS_DMA_COHERENT
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.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/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.c:1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.c:1.1 Sun Oct 18 15:42:00 2015
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_ramgk20a.c Mon Oct 19 23:31:26 2015
@@ -132,7 +132,7 @@ fail1: bus_dmamem_free(dmat, &mem->dmas
}
ret = -bus_dmamem_map(dmat, &mem->dmaseg, nsegs, dmasize,
- &mem->cpuaddr, BUS_DMA_WAITOK);
+ &mem->cpuaddr, BUS_DMA_WAITOK | BUS_DMA_COHERENT);
if (ret) {
fail2: bus_dmamap_destroy(dmat, mem->base.pages);
goto fail1;
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Mon Oct 19 22:00:09 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_hdmi.c
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
allow "hdmi.forcemode=dvi" kernel option to force HDMI transmitter into DVI mode
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_hdmi.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/tegra/tegra_machdep.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/arch/arm/nvidia/tegra_hdmi.c
diff -u src/sys/arch/arm/nvidia/tegra_hdmi.c:1.9 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.10
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.9 Fri Jul 31 23:07:14 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Mon Oct 19 22:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.9 2015/07/31 23:07:14 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.10 2015/10/19 22:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.9 2015/07/31 23:07:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.10 2015/10/19 22:00:09 jmcneill Exp $");
#include
#include
@@ -198,10 +198,12 @@ tegra_hdmi_hpd(struct tegra_hdmi_softc *
static void
tegra_hdmi_connect(struct tegra_hdmi_softc *sc)
{
+ prop_dictionary_t prop = device_properties(sc->sc_dev);
const struct videomode *mode;
char edid[128], *pedid = NULL;
struct edid_info ei;
int retry = 4, error;
+ bool force_dvi = false;
memset(&ei, 0, sizeof(ei));
@@ -237,7 +239,12 @@ tegra_hdmi_connect(struct tegra_hdmi_sof
}
sc->sc_curmode = mode;
- sc->sc_hdmimode = tegra_hdmi_is_hdmi(sc, &ei);
+ prop_dictionary_get_bool(prop, "force-dvi", &force_dvi);
+ if (force_dvi) {
+ sc->sc_hdmimode = false;
+ } else {
+ sc->sc_hdmimode = tegra_hdmi_is_hdmi(sc, &ei);
+ }
tegra_hdmi_enable(sc, pedid);
}
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.20 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.21
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.20 Sun Oct 18 17:07:36 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Mon Oct 19 22:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.20 2015/10/18 17:07:36 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.21 2015/10/19 22:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.20 2015/10/18 17:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.21 2015/10/19 22:00:09 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -472,6 +472,9 @@ tegra_device_register(device_t self, voi
prop_dictionary_set_cstring(dict, "power-gpio", "K6");
prop_dictionary_set_cstring(dict, "ddc-device", "ddc0");
prop_dictionary_set_cstring(dict, "display-device", "tegradc1");
+ if (tegra_bootconf_match("hdmi.forcemode", "dvi")) {
+ prop_dictionary_set_bool(dict, "force-dvi", true);
+ }
}
#endif
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Mon Oct 19 21:18:36 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: files.tegra Log Message: defflag TEGRA_HDMI_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/files.tegra Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/nvidia/files.tegra diff -u src/sys/arch/arm/nvidia/files.tegra:1.17 src/sys/arch/arm/nvidia/files.tegra:1.18 --- src/sys/arch/arm/nvidia/files.tegra:1.17 Sat Oct 17 21:18:16 2015 +++ src/sys/arch/arm/nvidia/files.tegra Mon Oct 19 21:18:36 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.tegra,v 1.17 2015/10/17 21:18:16 jmcneill Exp $ +# $NetBSD: files.tegra,v 1.18 2015/10/19 21:18:36 jmcneill Exp $ # # Configuration info for NVIDIA Tegra ARM Peripherals # @@ -110,6 +110,7 @@ file arch/arm/nvidia/tegra_genfb.c tegr device tegrahdmi: edid, ddc_read_edid, videomode attach tegrahdmi at tegraio with tegra_hdmi file arch/arm/nvidia/tegra_hdmi.c tegra_hdmi +defflag opt_tegra.h TEGRA_HDMI_DEBUG # HDMI CEC device tegracec: hdmicecbus
CVS commit: src/share/mk
Module Name:src
Committed By: dholland
Date: Mon Oct 19 17:08:11 UTC 2015
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
because I'm feeling tetchy, implement "make describe" for everything that
has man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.117 src/share/mk/bsd.man.mk:1.118
--- src/share/mk/bsd.man.mk:1.117 Fri Dec 19 22:25:39 2014
+++ src/share/mk/bsd.man.mk Mon Oct 19 17:08:11 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.117 2014/12/19 22:25:39 christos Exp $
+# $NetBSD: bsd.man.mk,v 1.118 2015/10/19 17:08:11 dholland Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include
@@ -293,6 +293,14 @@ lintmanpages: ${MANPAGES}
${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall,stop ${.ALLSRC}
.endif
+# describe
+describe:
+.for _M in ${MANPAGES}
+ @echo $$(basename ${_M}) - \
+ $$(${TOOL_SED} < ${${_M}:P} -n -e '/^\.Nd /{;s/^//;p;}')
+.endfor
+
+
# Pull in related .mk logic
.include
.include
CVS commit: src/share/mk
Module Name:src
Committed By: pooka
Date: Mon Oct 19 16:17:14 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Allow "make describe" to descend into SUBDIRs.
To generate a diff of this commit:
cvs rdiff -u -r1.876 -r1.877 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.876 src/share/mk/bsd.own.mk:1.877
--- src/share/mk/bsd.own.mk:1.876 Tue Oct 13 20:12:03 2015
+++ src/share/mk/bsd.own.mk Mon Oct 19 16:17:14 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.876 2015/10/13 20:12:03 rjs Exp $
+# $NetBSD: bsd.own.mk,v 1.877 2015/10/19 16:17:14 pooka Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -842,11 +842,11 @@ ARM_APCS_FLAGS+=${${ACTIVE_CC} == "clang
GENASSYM_CPPFLAGS+= ${${ACTIVE_CC} == "clang":? -no-integrated-as :}
TARGETS+= all clean cleandir depend dependall includes \
- install lint obj regress tags html analyze
+ install lint obj regress tags html analyze describe
PHONY_NOTMAIN = all clean cleandir depend dependall distclean includes \
install lint obj regress beforedepend afterdepend \
beforeinstall afterinstall realinstall realdepend realall \
- html subdir-all subdir-install subdir-depend analyze
+ html subdir-all subdir-install subdir-depend analyze describe
.PHONY: ${PHONY_NOTMAIN}
.NOTMAIN: ${PHONY_NOTMAIN}
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Oct 19 16:16:39 UTC 2015 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/dev/lib/libaudio: Makefile src/sys/rump/dev/lib/libaudio_ac97: Makefile src/sys/rump/dev/lib/libbpf: Makefile src/sys/rump/dev/lib/libcgd: Makefile src/sys/rump/dev/lib/libdisk: Makefile src/sys/rump/dev/lib/libdm: Makefile src/sys/rump/dev/lib/libdrvctl: Makefile src/sys/rump/dev/lib/libfss: Makefile src/sys/rump/dev/lib/libhdaudio_hdafg: Makefile src/sys/rump/dev/lib/libmd: Makefile src/sys/rump/dev/lib/libmiiphy: Makefile src/sys/rump/dev/lib/libnetsmb: Makefile src/sys/rump/dev/lib/libopencrypto: Makefile src/sys/rump/dev/lib/libpad: Makefile src/sys/rump/dev/lib/libpci: Makefile src/sys/rump/dev/lib/libpci_auich: Makefile src/sys/rump/dev/lib/libpci_eap: Makefile src/sys/rump/dev/lib/libpci_hdaudio: Makefile src/sys/rump/dev/lib/libpci_if_iwn: Makefile src/sys/rump/dev/lib/libpci_if_pcn: Makefile src/sys/rump/dev/lib/libpci_if_wm: Makefile src/sys/rump/dev/lib/libpci_usbhc: Makefile src/sys/rump/dev/lib/libpci_virtio: Makefile src/sys/rump/dev/lib/libpud: Makefile src/sys/rump/dev/lib/libputter: Makefile src/sys/rump/dev/lib/libraidframe: Makefile src/sys/rump/dev/lib/librnd: Makefile src/sys/rump/dev/lib/libscsipi: Makefile src/sys/rump/dev/lib/libsysmon: Makefile src/sys/rump/dev/lib/libubt: Makefile src/sys/rump/dev/lib/libucom: Makefile src/sys/rump/dev/lib/libugenhc: Makefile src/sys/rump/dev/lib/libulpt: Makefile src/sys/rump/dev/lib/libumass: Makefile src/sys/rump/dev/lib/libusb: Makefile src/sys/rump/dev/lib/libvirtio_if_vioif: Makefile src/sys/rump/dev/lib/libvirtio_ld: Makefile src/sys/rump/dev/lib/libvirtio_viornd: Makefile src/sys/rump/dev/lib/libvnd: Makefile src/sys/rump/dev/lib/libwscons: Makefile src/sys/rump/fs/lib/libaio: Makefile src/sys/rump/fs/lib/libcd9660: Makefile src/sys/rump/fs/lib/libefs: Makefile src/sys/rump/fs/lib/libext2fs: Makefile src/sys/rump/fs/lib/libfdesc: Makefile src/sys/rump/fs/lib/libffs: Makefile src/sys/rump/fs/lib/libfifovfs: Makefile src/sys/rump/fs/lib/libhfs: Makefile src/sys/rump/fs/lib/libkernfs: Makefile src/sys/rump/fs/lib/liblayervfs: Makefile src/sys/rump/fs/lib/liblfs: Makefile src/sys/rump/fs/lib/libmfs: Makefile src/sys/rump/fs/lib/libmsdos: Makefile src/sys/rump/fs/lib/libnfs: Makefile src/sys/rump/fs/lib/libnfsserver: Makefile src/sys/rump/fs/lib/libnilfs: Makefile src/sys/rump/fs/lib/libntfs: Makefile src/sys/rump/fs/lib/libnull: Makefile src/sys/rump/fs/lib/libptyfs: Makefile src/sys/rump/fs/lib/libsmbfs: Makefile src/sys/rump/fs/lib/libsyspuffs: Makefile src/sys/rump/fs/lib/libsysvbfs: Makefile src/sys/rump/fs/lib/libtmpfs: Makefile src/sys/rump/fs/lib/libudf: Makefile src/sys/rump/fs/lib/libumap: Makefile src/sys/rump/fs/lib/libunion: Makefile src/sys/rump/fs/lib/libv7fs: Makefile src/sys/rump/fs/lib/libzfs: Makefile src/sys/rump/kern/lib/libcrypto: Makefile src/sys/rump/kern/lib/libsljit: Makefile src/sys/rump/kern/lib/libsolaris: Makefile src/sys/rump/kern/lib/libsys_cygwin: Makefile src/sys/rump/kern/lib/libsys_linux: Makefile src/sys/rump/kern/lib/libsys_sunos: Makefile src/sys/rump/kern/lib/libsysproxy: Makefile src/sys/rump/kern/lib/libtty: Makefile src/sys/rump/kern/lib/libz: Makefile src/sys/rump/librump/rumpdev: Makefile.rumpdev src/sys/rump/librump/rumpkern: Makefile.rumpkern src/sys/rump/librump/rumpnet: Makefile.rumpnet src/sys/rump/librump/rumpvfs: Makefile.rumpvfs src/sys/rump/net/lib/libagr: Makefile src/sys/rump/net/lib/libbpfjit: Makefile src/sys/rump/net/lib/libbridge: Makefile src/sys/rump/net/lib/liblocal: Makefile src/sys/rump/net/lib/libnet: Makefile src/sys/rump/net/lib/libnet80211: Makefile src/sys/rump/net/lib/libnetbt: Makefile src/sys/rump/net/lib/libnetinet: Makefile src/sys/rump/net/lib/libnetinet6: Makefile src/sys/rump/net/lib/libnetmpls: Makefile src/sys/rump/net/lib/libnpf: Makefile src/sys/rump/net/lib/libshmif: Makefile src/sys/rump/net/lib/libsockin: Makefile src/sys/rump/net/lib/libtap: Makefile src/sys/rump/net/lib/libvirtif: Makefile Log Message: Add a COMMENT describing what each component roughly does. "make describe" prints the comment. Requested/inspired by Vincent Schwarzer on rumpkernel-use
CVS commit: src/share/man/man4
Module Name:src Committed By: pooka Date: Mon Oct 19 14:33:11 UTC 2015 Modified Files: src/share/man/man4: shmif.4 Log Message: terminology police: rump -> rump kernel To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/shmif.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/shmif.4 diff -u src/share/man/man4/shmif.4:1.3 src/share/man/man4/shmif.4:1.4 --- src/share/man/man4/shmif.4:1.3 Wed Nov 17 18:02:20 2010 +++ src/share/man/man4/shmif.4 Mon Oct 19 14:33:11 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: shmif.4,v 1.3 2010/11/17 18:02:20 wiz Exp $ +.\" $NetBSD: shmif.4,v 1.4 2015/10/19 14:33:11 pooka Exp $ .\" .\" Copyright (c) 2010 Antti Kantee .\" All rights reserved. @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm shmif -.Nd rump shared memory network interface +.Nd rump kernel shared memory network interface .Sh SYNOPSIS .In rump/rump.h .Ft int @@ -52,7 +52,7 @@ the bus hold). .El .Pp It is not possible to directly access the host networking -facilities from a rump virtual kernel using purely +facilities from a rump kernel using purely .Nm . However, traffic can be routed to another rump kernel instance which provides both
CVS commit: src/sys/dev/pci
Module Name:src Committed By: tnn Date: Mon Oct 19 09:57:37 UTC 2015 Modified Files: src/sys/dev/pci: pcidevs Log Message: fix I219_LM2 entry To generate a diff of this commit: cvs rdiff -u -r1.1236 -r1.1237 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1236 src/sys/dev/pci/pcidevs:1.1237 --- src/sys/dev/pci/pcidevs:1.1236 Mon Oct 19 09:54:21 2015 +++ src/sys/dev/pci/pcidevs Mon Oct 19 09:57:37 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1236 2015/10/19 09:54:21 tnn Exp $ +$NetBSD: pcidevs,v 1.1237 2015/10/19 09:57:37 tnn Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2985,7 +2985,7 @@ product INTEL I218_LM2 0x15a0 I218-LM E product INTEL I218_V2 0x15a1 I218-V Ethernet Connection product INTEL I218_LM3 0x15a2 I218-LM Ethernet Connection product INTEL I218_V3 0x15a3 I218-V Ethernet Connection -product INTEL I219_LM 0x15b7 I219-LM Ethernet Connection +product INTEL I219_LM2 0x15b7 I219-LM Ethernet Connection product INTEL I219_V2 0x15b8 I219-V Ethernet Connection product INTEL CORE5G_HB_1 0x1604 Core 5G Host Bridge product INTEL CORE5G_HDA_1 0x160c Core 5G HD Audio
CVS commit: src/sys/dev/pci
Module Name:src Committed By: tnn Date: Mon Oct 19 09:54:21 UTC 2015 Modified Files: src/sys/dev/pci: pcidevs Log Message: add I219 family Ethernet devices To generate a diff of this commit: cvs rdiff -u -r1.1235 -r1.1236 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1235 src/sys/dev/pci/pcidevs:1.1236 --- src/sys/dev/pci/pcidevs:1.1235 Fri Aug 28 13:09:48 2015 +++ src/sys/dev/pci/pcidevs Mon Oct 19 09:54:21 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1235 2015/08/28 13:09:48 nonaka Exp $ +$NetBSD: pcidevs,v 1.1236 2015/10/19 09:54:21 tnn Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2968,6 +2968,8 @@ product INTEL I218_V 0x1559 I218-V Ethe product INTEL I218_LM 0x155a I218-LM Ethernet Connection product INTEL X540_BYPASS 0x155c X540 10 GbE Bypass product INTEL 82599_BYPASS 0x155d 82599 10 GbE Bypass +product INTEL I219_LM 0x156f I219-LM Ethernet Connection +product INTEL I219_V 0x1570 I219-V Ethernet Connection product INTEL XL710_VF_HV 0x1571 XL710 Ethernet Virtual Function product INTEL XL710_SFP 0x1572 XL710 SFP+ Ethernet product INTEL I210_COPPER_WOF 0x157b I210 Ethernet (COPPER) @@ -2983,6 +2985,8 @@ product INTEL I218_LM2 0x15a0 I218-LM E product INTEL I218_V2 0x15a1 I218-V Ethernet Connection product INTEL I218_LM3 0x15a2 I218-LM Ethernet Connection product INTEL I218_V3 0x15a3 I218-V Ethernet Connection +product INTEL I219_LM 0x15b7 I219-LM Ethernet Connection +product INTEL I219_V2 0x15b8 I219-V Ethernet Connection product INTEL CORE5G_HB_1 0x1604 Core 5G Host Bridge product INTEL CORE5G_HDA_1 0x160c Core 5G HD Audio product INTEL CORE5G_M_GT1 0x1606 HD Graphics (GT1)
CVS commit: src/sys/net/npf
Module Name:src
Committed By: martin
Date: Mon Oct 19 09:28:25 UTC 2015
Modified Files:
src/sys/net/npf: npf.c
Log Message:
Ifdef npf_init() the same way as all it's callers are protected.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/net/npf/npf.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/net/npf/npf.c
diff -u src/sys/net/npf/npf.c:1.27 src/sys/net/npf/npf.c:1.28
--- src/sys/net/npf/npf.c:1.27 Mon Oct 19 00:29:57 2015
+++ src/sys/net/npf/npf.c Mon Oct 19 09:28:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.27 2015/10/19 00:29:57 christos Exp $ */
+/* $NetBSD: npf.c,v 1.28 2015/10/19 09:28:24 martin Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.27 2015/10/19 00:29:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.28 2015/10/19 09:28:24 martin Exp $");
#include
#include
@@ -102,6 +102,7 @@ const struct cdevsw npf_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE
};
+#if !defined(MODULAR) || defined(_MODULE)
static int
npf_init(void)
{
@@ -136,6 +137,7 @@ npf_init(void)
return 0;
#endif
}
+#endif
static int
npf_fini(void)
