CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: chs
Date: Sun Jun 3 05:55:08 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h sysmacros.h time.h types.h
Log Message:
tweak the osnet compat headers to allow building on MacOS and Linux hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/sys/sys/time.h
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.7 src/external/cddl/osnet/sys/sys/proc.h:1.8
--- src/external/cddl/osnet/sys/sys/proc.h:1.7 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: proc.h,v 1.8 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,9 @@
#define _OPENSOLARIS_SYS_PROC_H_
#include_next
+#ifdef __NetBSD__
#include
+#endif
#ifdef _KERNEL
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 src/external/cddl/osnet/sys/sys/sysmacros.h:1.9
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.8 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.8 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: sysmacros.h,v 1.9 2018/06/03 05:55:08 chs Exp $ */
/*
* CDDL HEADER START
@@ -32,6 +32,16 @@
#ifndef _SYS_SYSMACROS_H
#define _SYS_SYSMACROS_H
+/*
+ * Linux includes from with
+ * __SYSMACROS_DEPRECATED_INCLUSION defined during the include,
+ * but some of the definitions here break in that context,
+ * so if that symbol is defined then only define the few macros
+ * that we need there.
+ */
+
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#include
#include
@@ -52,6 +62,8 @@ extern "C" {
#define btodt(BB) ((BB) >> DEV_BSHIFT)
#define lbtod(BB) (((offset_t)(BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
/* common macros */
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -66,6 +78,8 @@ extern "C" {
#define SIGNOF(a) ((a) < 0 ? -1 : (a) > 0)
#endif
+#ifndef __SYSMACROS_DEPRECATED_INCLUSION
+
#ifdef _KERNEL
/*
@@ -469,4 +483,6 @@ highbit64(uint64_t i)
}
#endif
+#endif /* __SYSMACROS_DEPRECATED_INCLUSION */
+
#endif /* _SYS_SYSMACROS_H */
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.11 src/external/cddl/osnet/sys/sys/time.h:1.12
--- src/external/cddl/osnet/sys/sys/time.h:1.11 Sat Jun 2 18:46:34 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
+/* $NetBSD: time.h,v 1.12 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -92,8 +92,13 @@ ddi_get_lbolt64(void)
#else
+#ifdef __NetBSD__
int clock_gettime(clockid_t, struct timespec *)
__RENAME(__clock_gettime50);
+#endif
+#ifdef __linux__
+#include
+#endif
static __inline hrtime_t gethrtime(void) {
struct timespec ts;
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.19 src/external/cddl/osnet/sys/sys/types.h:1.20
--- src/external/cddl/osnet/sys/sys/types.h:1.19 Fri Jun 1 00:56:19 2018
+++ src/external/cddl/osnet/sys/sys/types.h Sun Jun 3 05:55:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.19 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: types.h,v 1.20 2018/06/03 05:55:08 chs Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -65,11 +65,13 @@
*/
#define longlong_t __hide_longlong_t
#define u_longlong_t __hide_u_longlong_t
+
#ifndef _KERNEL
#include
#else
#include
#endif
+
#ifndef HAVE_NBTOOLS_CONFIG_H
#ifdef _NETBSD_SOURCE
#include_next
@@ -81,6 +83,7 @@
#undef _NETBSD_SOURCE
#endif
#endif
+
#undef longlong_t
#undef u_longlong_t
#ifndef __defined_ll_t
CVS commit: src/external/bsd/top/dist
Module Name:src
Committed By: eadler
Date: Sun Jun 3 05:29:27 UTC 2018
Modified Files:
src/external/bsd/top/dist: top.c
Log Message:
top(1): revert 1.11
This change breaks the expectations of users that would like a coredump
of top(1). Other similar applications such as vmstat(1) don't do this.
Since the change was just a courtesy, revert.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/top/dist/top.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/top/dist/top.c
diff -u src/external/bsd/top/dist/top.c:1.11 src/external/bsd/top/dist/top.c:1.12
--- src/external/bsd/top/dist/top.c:1.11 Sat Jun 2 22:30:19 2018
+++ src/external/bsd/top/dist/top.c Sun Jun 3 05:29:27 2018
@@ -119,6 +119,7 @@ quit(int status)
{
screen_end();
+chdir("/tmp");
exit(status);
/* NOTREACHED */
}
@@ -725,16 +726,6 @@ main(int argc, char *argv[])
struct statics statics;
globalstate *gstate;
-/*
- * Since top(1) is often long running and
- * doesn't typically care about where its running from
- * chdir to the root to allow unmounting of its
- * original wd. Failure is alright as this is
- * just a courtesy for users.
- */
-chdir("/");
-
-
/* get our name */
if (argc > 0)
{
CVS commit: src/share/mk
Module Name:src Committed By: wiz Date: Sun Jun 3 04:41:04 UTC 2018 Modified Files: src/share/mk: bsd.README Log Message: Fix MKFIRMWARE description. To generate a diff of this commit: cvs rdiff -u -r1.374 -r1.375 src/share/mk/bsd.README 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.README diff -u src/share/mk/bsd.README:1.374 src/share/mk/bsd.README:1.375 --- src/share/mk/bsd.README:1.374 Sun Jun 3 04:38:12 2018 +++ src/share/mk/bsd.README Sun Jun 3 04:41:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.374 2018/06/03 04:38:12 wiz Exp $ +# $NetBSD: bsd.README,v 1.375 2018/06/03 04:41:04 wiz Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -194,7 +194,7 @@ MKEXTSRCIf not "no", 'make build users, and automatically enables creation of those sets. Default: no -MKFIRMWARE If "no", install the /libdata/firmware directory, +MKFIRMWARE If not "no", install the /libdata/firmware directory, which is necessary for several drivers: athn(4), bwfm(4), ipw(4), iwi(4), iwm(4), iwn(4), otus(4), rtwn(4), urtwn(4), wpi(4), ral(4), rum(4), run(4), zyd(4), bcm43xx(4), and
CVS commit: src/share/mk
Module Name:src Committed By: wiz Date: Sun Jun 3 04:38:12 UTC 2018 Modified Files: src/share/mk: bsd.README Log Message: Fix MKSANITIZER default in description. To generate a diff of this commit: cvs rdiff -u -r1.373 -r1.374 src/share/mk/bsd.README 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.README diff -u src/share/mk/bsd.README:1.373 src/share/mk/bsd.README:1.374 --- src/share/mk/bsd.README:1.373 Sat Jun 2 01:41:49 2018 +++ src/share/mk/bsd.README Sun Jun 3 04:38:12 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.373 2018/06/02 01:41:49 christos Exp $ +# $NetBSD: bsd.README,v 1.374 2018/06/03 04:38:12 wiz Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -389,7 +389,7 @@ MKREPRO If "yes", create reprodu MKSANITIZER if "yes", use the selected sanitizer to compile userland programs as defined in USE_SANITIZER, which defaults to - "memory". Available sanitizers are: + "address". Available sanitizers are: address: A memory error detector (default) thread: A data race detector memory: An uninitializer read detector @@ -397,7 +397,7 @@ MKSANITIZER if "yes", use the selected s dataflow: A general data flow analysis cfi: A control flow detector safe-stack: Protect against stack-based corruption - Only "address" is currently available for gcc(1) + Only "address" is currently available for gcc(1). MKSHARE If "no", act as "MKCATPAGES=no MKDOC=no MKHTML=no MKINFO=no MKMAN=no MKNLS=no".
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: chs
Date: Sun Jun 3 03:05:56 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dmu_tx.c
Log Message:
avoid calling kpause() with a delay of 0.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.3
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c:1.2 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c Sun Jun 3 03:05:56 2018
@@ -1151,7 +1151,11 @@ dmu_tx_delay(dmu_tx_t *tx, uint64_t dirt
zfs_delay_resolution_ns * SBT_1NS, C_ABSOLUTE);
#endif
#ifdef __NetBSD__
- kpause("dmu_tx_delay", false, (wakeup - now) * hz / 10, NULL);
+ int timo = (wakeup - now) * hz / 10;
+
+ if (timo == 0)
+ timo = 1;
+ kpause("dmu_tx_delay", false, timo, NULL);
#endif
#else
hrtime_t delta = wakeup - gethrtime();
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Sun Jun 3 02:13:09 UTC 2018
Modified Files:
src/sys/dev/pci: ld_virtio.c
Log Message:
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ld_virtio.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/dev/pci/ld_virtio.c
diff -u src/sys/dev/pci/ld_virtio.c:1.16 src/sys/dev/pci/ld_virtio.c:1.17
--- src/sys/dev/pci/ld_virtio.c:1.16 Wed Aug 9 16:44:40 2017
+++ src/sys/dev/pci/ld_virtio.c Sun Jun 3 02:13:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_virtio.c,v 1.16 2017/08/09 16:44:40 mlelstv Exp $ */
+/* $NetBSD: ld_virtio.c,v 1.17 2018/06/03 02:13:09 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.16 2017/08/09 16:44:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.17 2018/06/03 02:13:09 jakllsch Exp $");
#include
#include
@@ -71,10 +71,10 @@ __KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,
#define VIRTIO_BLK_F_SCSI (1<<7)
#define VIRTIO_BLK_F_FLUSH (1<<9)
-/*
+/*
* Each block request uses at least two segments - one for the header
* and one for the status.
-*/
+*/
#define VIRTIO_BLK_MIN_SEGMENTS 2
#define VIRTIO_BLK_FLAG_BITS \
@@ -504,7 +504,7 @@ ld_virtio_dump(struct ld_softc *ld, void
if (r != 0)
return r;
- r = virtio_enqueue_reserve(vsc, vq, slot, vr->vr_payload->dm_nsegs +
+ r = virtio_enqueue_reserve(vsc, vq, slot, vr->vr_payload->dm_nsegs +
VIRTIO_BLK_MIN_SEGMENTS);
if (r != 0) {
bus_dmamap_unload(virtio_dmat(vsc), vr->vr_payload);
@@ -549,7 +549,7 @@ ld_virtio_dump(struct ld_softc *ld, void
} else
break;
}
-
+
bus_dmamap_sync(virtio_dmat(vsc), vr->vr_cmdsts,
0, sizeof(struct virtio_blk_req_hdr),
BUS_DMASYNC_POSTWRITE);
@@ -612,7 +612,7 @@ MODULE(MODULE_CLASS_DRIVER, ld_virtio, "
#define CFDRIVER_DECL(name, class, attr)
#include "ioconf.c"
#endif
-
+
static int
ld_virtio_modcmd(modcmd_t cmd, void *opaque)
{
@@ -624,7 +624,7 @@ ld_virtio_modcmd(modcmd_t cmd, void *opa
static struct cfdriver * const no_cfdriver_vec[] = { NULL };
#endif
int error = 0;
-
+
#ifdef _MODULE
switch (cmd) {
case MODULE_CMD_INIT:
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: pgoyette Date: Sun Jun 3 01:55:17 UTC 2018 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Update sets lists for new MLINKS for module(9) To generate a diff of this commit: cvs rdiff -u -r1.2200 -r1.2201 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2200 src/distrib/sets/lists/comp/mi:1.2201 --- src/distrib/sets/lists/comp/mi:1.2200 Mon May 28 22:28:56 2018 +++ src/distrib/sets/lists/comp/mi Sun Jun 3 01:55:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2200 2018/05/28 22:28:56 pgoyette Exp $ +# $NetBSD: mi,v 1.2201 2018/06/03 01:55:16 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -11129,9 +11129,11 @@ ./usr/share/man/cat9/module_load_vfs_init.0 comp-sys-catman .cat ./usr/share/man/cat9/module_name.0 comp-sys-catman .cat ./usr/share/man/cat9/module_rele.0 comp-sys-catman .cat +./usr/share/man/cat9/module_register.0 comp-sys-catman .cat ./usr/share/man/cat9/module_source.0 comp-sys-catman .cat ./usr/share/man/cat9/module_start_unload_thread.0 comp-sys-catman .cat ./usr/share/man/cat9/module_unload.0 comp-sys-catman .cat +./usr/share/man/cat9/module_unregister.0 comp-sys-catman .cat ./usr/share/man/cat9/mono_time.0 comp-obsolete obsolete ./usr/share/man/cat9/mstohz.0 comp-sys-catman .cat ./usr/share/man/cat9/mtocl.0 comp-sys-catman .cat @@ -18816,9 +18818,11 @@ ./usr/share/man/html9/module_load_vfs_init.html comp-sys-htmlman html ./usr/share/man/html9/module_name.html comp-sys-htmlman html ./usr/share/man/html9/module_rele.html comp-sys-htmlman html +./usr/share/man/html9/module_register.html comp-sys-htmlman html ./usr/share/man/html9/module_source.html comp-sys-htmlman html ./usr/share/man/html9/module_start_unload_thread.html comp-sys-htmlman html ./usr/share/man/html9/module_unload.html comp-sys-htmlman html +./usr/share/man/html9/module_unregister.html comp-sys-htmlman html ./usr/share/man/html9/mstohz.html comp-sys-htmlman html ./usr/share/man/html9/mtocl.html comp-sys-htmlman html ./usr/share/man/html9/mtod.html comp-sys-htmlman html @@ -26657,9 +26661,11 @@ ./usr/share/man/man9/module_load_vfs_init.9 comp-sys-man .man ./usr/share/man/man9/module_name.9 comp-sys-man .man ./usr/share/man/man9/module_rele.9 comp-sys-man .man +./usr/share/man/man9/module_register.9 comp-sys-man .man ./usr/share/man/man9/module_source.9 comp-sys-man .man ./usr/share/man/man9/module_start_unload_thread.9 comp-sys-man .man ./usr/share/man/man9/module_unload.9 comp-sys-man .man +./usr/share/man/man9/module_unregister.9 comp-sys-man .man ./usr/share/man/man9/mono_time.9 comp-obsolete obsolete ./usr/share/man/man9/mstohz.9 comp-sys-man .man ./usr/share/man/man9/mtocl.9 comp-sys-man .man
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Sun Jun 3 01:52:48 UTC 2018 Modified Files: src/share/man/man9: Makefile module.9 Log Message: Also add new entries in the .Nm list, and update Makefile to actually build the MLINKS To generate a diff of this commit: cvs rdiff -u -r1.423 -r1.424 src/share/man/man9/Makefile cvs rdiff -u -r1.44 -r1.45 src/share/man/man9/module.9 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/man9/Makefile diff -u src/share/man/man9/Makefile:1.423 src/share/man/man9/Makefile:1.424 --- src/share/man/man9/Makefile:1.423 Mon May 28 22:25:12 2018 +++ src/share/man/man9/Makefile Sun Jun 3 01:52:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.423 2018/05/28 22:25:12 pgoyette Exp $ +# $NetBSD: Makefile,v 1.424 2018/06/03 01:52:47 pgoyette Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -531,7 +531,9 @@ MLINKS+=module.9 module_autoload.9 \ module.9 module_rele.9 \ module.9 module_source.9 \ module.9 module_start_unload_thread.9 \ - module.9 module_unload.9 + module.9 module_unload.9 \ + module.9 module_register_callbacks.9 \ + module.9 module_unregister_callbacks.9 MLINKS+=mstohz.9 hztoms.9 MLINKS+=mutex.9 mutex_init.9 mutex.9 mutex_destroy.9 mutex.9 mutex_enter.9 \ mutex.9 mutex_exit.9 mutex.9 mutex_tryenter.9 mutex.9 mutex_owned.9 \ Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.44 src/share/man/man9/module.9:1.45 --- src/share/man/man9/module.9:1.44 Sun Jun 3 01:50:28 2018 +++ src/share/man/man9/module.9 Sun Jun 3 01:52:47 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.44 2018/06/03 01:50:28 pgoyette Exp $ +.\" $NetBSD: module.9,v 1.45 2018/06/03 01:52:47 pgoyette Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -41,7 +41,9 @@ .Nm module_find_section , .Nm module_kernel , .Nm module_name , -.Nm module_source +.Nm module_source , +.Nm module_register_callbacks , +.Nm module_unregister_callbacks .Nd kernel module loader .Sh SYNOPSIS .In sys/module.h
CVS commit: src/share/man/man9
Module Name:src
Committed By: pgoyette
Date: Sun Jun 3 01:50:28 UTC 2018
Modified Files:
src/share/man/man9: module.9
Log Message:
Add documentation on the module_{,un}register_callbacks() routines.
XXX Still need to document the module_specificdata_* stuff, which
XXX needs to refer to a non-existent specificdata(9) man page!
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/module.9
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/man9/module.9
diff -u src/share/man/man9/module.9:1.43 src/share/man/man9/module.9:1.44
--- src/share/man/man9/module.9:1.43 Mon May 28 22:22:54 2018
+++ src/share/man/man9/module.9 Sun Jun 3 01:50:28 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: module.9,v 1.43 2018/05/28 22:22:54 pgoyette Exp $
+.\" $NetBSD: module.9,v 1.44 2018/06/03 01:50:28 pgoyette Exp $
.\"
.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 29, 2018
+.Dd June 3, 2018
.Dt MODULE 9
.Os
.Sh NAME
@@ -75,6 +75,11 @@
.Fn module_builtin_require_force "void"
.Ft void
.Fn module_load_vfs_init "void"
+.Ft "void *"
+.Fn module_register_callbacks "void (*)(struct module *)" \
+"void (*unload)(struct module *)"
+.Ft void
+.Fn module_unregister_callbacks "void *"
.Sh DESCRIPTION
Modules are sections of code that can be independently linked and selectively
loaded into or unloaded from a running kernel.
@@ -443,14 +448,35 @@ is specified.
is called near the end of system initialization, after the
.Xr init 8
process is created.
-.It Fn module_load_vfs_init
+.It Fn module_load_vfs_init "void"
The module subsystem is initialized early, long before any file systems
are available.
After the root file system is mounted,
-.Fn module_load_vfs_init
+.Fn module_load_vfs_init "void"
is used to enable loading modules from the file system.
Until this routine is called, modules can only be loaded if they were
built-in to the kernel image or provided by the boot loader.
+.It Fn module_register_callbacks "void (*load)(struct module *)" \
+"void (*unload)(struct module *)"
+Register a new set of callbacks.
+The
+.Fa load
+callback is invoked after any module (including this module) is
+successfully loaded; the
+.Fa unload
+callback is invoked before any module is unloaded.
+Each load or unload event can result in multiple invocations of the
+callback routines.
+An opaque cookie is returned which can be passed to
+.Fn module_unregister_callbacks .
+.It Fn module_unregister_callbacks "void *opaque"
+Unregister a set of callback routines previously registered with
+.Fn module_register_callbacks .
+The
+.Fa opaque
+argument should be the return value from the previous
+.Fn module_register_callbacks
+call.
.El
.Sh PROGRAMMING CONSIDERATIONS
The module subsystem is designed to be called recursively, but only within
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Sun Jun 3 01:08:55 UTC 2018
Modified Files:
src/sys/dev/fdt: fdt_dai.c
Log Message:
Remove unnecessary include
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/fdt_dai.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/dev/fdt/fdt_dai.c
diff -u src/sys/dev/fdt/fdt_dai.c:1.1 src/sys/dev/fdt/fdt_dai.c:1.2
--- src/sys/dev/fdt/fdt_dai.c:1.1 Wed May 9 23:59:05 2018
+++ src/sys/dev/fdt/fdt_dai.c Sun Jun 3 01:08:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_dai.c,v 1.1 2018/05/09 23:59:05 jmcneill Exp $ */
+/* $NetBSD: fdt_dai.c,v 1.2 2018/06/03 01:08:55 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_dai.c,v 1.1 2018/05/09 23:59:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_dai.c,v 1.2 2018/06/03 01:08:55 jmcneill Exp $");
#include
#include
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_dai.c,v
#include
#include
-#include
-
struct fdtbus_dai_controller {
device_t dc_dev;
int dc_phandle;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Sat Jun 2 22:43:15 UTC 2018
Modified Files:
src/sys/dev/pci: virtio.c virtio_pci.c virtiovar.h
Log Message:
Begin to detangle virtio from its PCI attachment
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/virtiovar.h
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/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.30 src/sys/dev/pci/virtio.c:1.31
--- src/sys/dev/pci/virtio.c:1.30 Wed Feb 14 14:04:48 2018
+++ src/sys/dev/pci/virtio.c Sat Jun 2 22:43:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.30 2018/02/14 14:04:48 uwe Exp $ */
+/* $NetBSD: virtio.c,v 1.31 2018/06/02 22:43:15 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.30 2018/02/14 14:04:48 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.31 2018/06/02 22:43:15 jakllsch Exp $");
#include
#include
@@ -48,300 +48,15 @@ __KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1
#define MINSEG_INDIRECT 2 /* use indirect if nsegs >= this value */
-static int virtio_intr(void *arg);
-static int virtio_msix_queue_intr(void *);
-static int virtio_msix_config_intr(void *);
-static int virtio_setup_msix_vectors(struct virtio_softc *);
-static int virtio_setup_msix_interrupts(struct virtio_softc *,
- struct pci_attach_args *);
-static int virtio_setup_intx_interrupt(struct virtio_softc *,
- struct pci_attach_args *);
-static int virtio_setup_interrupts(struct virtio_softc *);
-static void virtio_free_interrupts(struct virtio_softc *);
-static void virtio_soft_intr(void *arg);
static void virtio_init_vq(struct virtio_softc *,
struct virtqueue *, const bool);
-
-/* we use the legacy virtio spec, so the pci registers are host native
- * byte order, not pci (i.e. LE) byte order */
-static inline uint16_t
-nbo_bus_space_read_2(bus_space_tag_t space, bus_space_handle_t handle,
- bus_size_t offset)
-{
- return le16toh(bus_space_read_2(space, handle, offset));
-}
-
-static inline uint32_t
-nbo_bus_space_read_4(bus_space_tag_t space, bus_space_handle_t handle,
- bus_size_t offset)
-{
- return le32toh(bus_space_read_4(space, handle, offset));
-}
-
-static void
-nbo_bus_space_write_2(bus_space_tag_t space, bus_space_handle_t handle,
- bus_size_t offset, uint16_t value)
-{
- bus_space_write_2(space, handle, offset, htole16(value));
-}
-
-static void
-nbo_bus_space_write_4(bus_space_tag_t space, bus_space_handle_t handle,
- bus_size_t offset, uint32_t value)
-{
- bus_space_write_4(space, handle, offset, htole32(value));
-}
-
-/* some functions access registers at 4 byte offset for little/high halves */
-#if BYTE_ORDER == BIG_ENDIAN
-#define REG_HI_OFF 0
-#define REG_LO_OFF 4
-#else
-#define REG_HI_OFF 4
-#define REG_LO_OFF 0
-#endif
-
void
virtio_set_status(struct virtio_softc *sc, int status)
{
- int old = 0;
-
- if (status != 0)
- old = bus_space_read_1(sc->sc_iot, sc->sc_ioh,
- VIRTIO_CONFIG_DEVICE_STATUS);
- bus_space_write_1(sc->sc_iot, sc->sc_ioh, VIRTIO_CONFIG_DEVICE_STATUS,
- status|old);
-}
-
-#define VIRTIO_MSIX_CONFIG_VECTOR_INDEX 0
-#define VIRTIO_MSIX_QUEUE_VECTOR_INDEX 1
-
-static int
-virtio_setup_msix_vectors(struct virtio_softc *sc)
-{
- int offset, vector, ret, qid;
-
- offset = VIRTIO_CONFIG_MSI_CONFIG_VECTOR;
- vector = VIRTIO_MSIX_CONFIG_VECTOR_INDEX;
-
- nbo_bus_space_write_2(sc->sc_iot, sc->sc_ioh, offset, vector);
- ret = nbo_bus_space_read_2(sc->sc_iot, sc->sc_ioh, offset);
- aprint_debug_dev(sc->sc_dev, "expected=%d, actual=%d\n",
- vector, ret);
- if (ret != vector)
- return -1;
-
- for (qid = 0; qid < sc->sc_nvqs; qid++) {
- offset = VIRTIO_CONFIG_QUEUE_SELECT;
- nbo_bus_space_write_2(sc->sc_iot, sc->sc_ioh, offset, qid);
-
- offset = VIRTIO_CONFIG_MSI_QUEUE_VECTOR;
- vector = VIRTIO_MSIX_QUEUE_VECTOR_INDEX;
-
- nbo_bus_space_write_2(sc->sc_iot, sc->sc_ioh, offset, vector);
- ret = nbo_bus_space_read_2(sc->sc_iot, sc->sc_ioh, offset);
- aprint_debug_dev(sc->sc_dev, "expected=%d, actual=%d\n",
- vector, ret);
- if (ret != vector)
- return -1;
- }
-
- return 0;
-}
-
-static int
-virtio_setup_msix_interrupts(struct virtio_softc *sc,
-struct pci_attach_args *pa)
-{
- device_t self = sc->sc_dev;
- pci_chipset_tag_t pc = pa->pa_pc;
- char intrbuf[PCI_INTRSTR_LEN];
- char const *intrstr;
- int idx;
-
- idx = VIRTIO_MSIX_CONFIG_VECTOR_INDEX;
- if (sc->sc_flags & VIRTIO_F_PCI_INTR_MPSAFE)
- pci_intr_setattr(pc, >sc_ihp[idx], PCI_INTR_MPSAFE, true);
-
- sc->sc_ihs[idx] = pci_intr_establish_xname(pc, sc->sc_ihp[idx],
- sc->sc_ipl, virtio_msix_config_intr, sc, device_xname(sc->sc_dev));
- if (sc->sc_ihs[idx] == NULL) {
- aprint_error_dev(self, "couldn't establish MSI-X for config\n");
CVS commit: src/external/bsd/top/dist
Module Name:src
Committed By: eadler
Date: Sat Jun 2 22:30:20 UTC 2018
Modified Files:
src/external/bsd/top/dist: top.c
Log Message:
top(1): chdir to / at init
This allows us to unmount whatever directory we happen to be in when we
started top(1).
ok phone
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/top/dist/top.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/top/dist/top.c
diff -u src/external/bsd/top/dist/top.c:1.10 src/external/bsd/top/dist/top.c:1.11
--- src/external/bsd/top/dist/top.c:1.10 Thu May 31 09:20:05 2018
+++ src/external/bsd/top/dist/top.c Sat Jun 2 22:30:19 2018
@@ -119,7 +119,6 @@ quit(int status)
{
screen_end();
-chdir("/tmp");
exit(status);
/* NOTREACHED */
}
@@ -726,6 +725,16 @@ main(int argc, char *argv[])
struct statics statics;
globalstate *gstate;
+/*
+ * Since top(1) is often long running and
+ * doesn't typically care about where its running from
+ * chdir to the root to allow unmounting of its
+ * original wd. Failure is alright as this is
+ * just a courtesy for users.
+ */
+chdir("/");
+
+
/* get our name */
if (argc > 0)
{
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sat Jun 2 22:25:30 UTC 2018 Modified Files: src/sys/sys: kernel.h Log Message: make his freestanding. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/sys/kernel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/kernel.h diff -u src/sys/sys/kernel.h:1.29 src/sys/sys/kernel.h:1.30 --- src/sys/sys/kernel.h:1.29 Tue Jul 30 09:14:30 2013 +++ src/sys/sys/kernel.h Sat Jun 2 18:25:30 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kernel.h,v 1.29 2013/07/30 13:14:30 matt Exp $ */ +/* $NetBSD: kernel.h,v 1.30 2018/06/02 22:25:30 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -40,6 +40,8 @@ #define _SYS_KERNEL_H_ #if defined(_KERNEL) || defined(_STANDALONE) +#include + /* Global variables for the kernel. */ extern long hostid;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: sevan
Date: Sat Jun 2 21:17:06 UTC 2018
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.739 -r1.740 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.740 -r1.741 src/sys/dev/usb/usbdevs_data.h
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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.739 src/sys/dev/usb/usbdevs.h:1.740
--- src/sys/dev/usb/usbdevs.h:1.739 Mon Apr 2 00:46:07 2018
+++ src/sys/dev/usb/usbdevs.h Sat Jun 2 21:17:06 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.739 2018/04/02 00:46:07 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.740 2018/06/02 21:17:06 sevan Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.747 2018/04/02 00:45:06 jakllsch Exp
+ * NetBSD: usbdevs,v 1.748 2018/06/02 21:15:33 sevan Exp
*/
/*
@@ -891,6 +891,7 @@
#define USB_PRODUCT_APPLE_IPAD_3 0x12a6 /* Apple iPad 3 */
#define USB_PRODUCT_APPLE_IPAD_MINI 0x12ab /* Apple iPad Mini */
#define USB_PRODUCT_APPLE_ETHERNET 0x1402 /* Apple USB to Ethernet */
+#define USB_PRODUCT_APPLE_BLUETOOTH1 0x8203 /* Bluetooth */
#define USB_PRODUCT_APPLE_BLUETOOTH2 0x8205 /* Bluetooth */
#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_1 0x8213 /* Bluetooth USB Host Controller MacBookPro 7,1 */
#define USB_PRODUCT_APPLE_BLUETOOTH_HOST_2 0x8215 /* Bluetooth USB Host Controller iMac 11,1 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.740 src/sys/dev/usb/usbdevs_data.h:1.741
--- src/sys/dev/usb/usbdevs_data.h:1.740 Mon Apr 2 00:46:07 2018
+++ src/sys/dev/usb/usbdevs_data.h Sat Jun 2 21:17:06 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.740 2018/04/02 00:46:07 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.741 2018/06/02 21:17:06 sevan Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.747 2018/04/02 00:45:06 jakllsch Exp
+ * NetBSD: usbdevs,v 1.748 2018/06/02 21:15:33 sevan Exp
*/
/*
@@ -980,6 +980,8 @@ static const uint16_t usb_products[] = {
1561, 6404, 6413, 0,
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ETHERNET,
1561, 4774, 5587, 4804, 0,
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH1,
+ 4778, 0,
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH2,
4778, 0,
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HOST_1,
@@ -5459,7 +5461,7 @@ static const char usb_words[] = { "."
"USRP\0" /* 2 refs @ 4757 */
"HomeConnect\0" /* 4 refs @ 4762 */
"USB\0" /* 204 refs @ 4774 */
- "Bluetooth\0" /* 25 refs @ 4778 */
+ "Bluetooth\0" /* 26 refs @ 4778 */
"Adapter\0" /* 74 refs @ 4788 */
"3C19250\0" /* 1 refs @ 4796 */
"Ethernet\0" /* 90 refs @ 4804 */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: sevan Date: Sat Jun 2 21:15:33 UTC 2018 Modified Files: src/sys/dev/usb: usbdevs Log Message: Apple Bluetooth adapter, as found on the G4 PowerBook FW-800 (PowerBook5,2) ubt0: Apple Computer (0x5ac) product 8203 (0x8203), rev 1.10/5.26, addr 2 To generate a diff of this commit: cvs rdiff -u -r1.747 -r1.748 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.747 src/sys/dev/usb/usbdevs:1.748 --- src/sys/dev/usb/usbdevs:1.747 Mon Apr 2 00:45:06 2018 +++ src/sys/dev/usb/usbdevs Sat Jun 2 21:15:33 2018 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.747 2018/04/02 00:45:06 jakllsch Exp $ +$NetBSD: usbdevs,v 1.748 2018/06/02 21:15:33 sevan Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -884,6 +884,7 @@ product APPLE IPAD_2 0x12a2 Apple iPad product APPLE IPAD_3 0x12a6 Apple iPad 3 product APPLE IPAD_MINI 0x12ab Apple iPad Mini product APPLE ETHERNET 0x1402 Apple USB to Ethernet +product APPLE BLUETOOTH1 0x8203 Bluetooth product APPLE BLUETOOTH2 0x8205 Bluetooth product APPLE BLUETOOTH_HOST_1 0x8213 Bluetooth USB Host Controller MacBookPro 7,1 product APPLE BLUETOOTH_HOST_2 0x8215 Bluetooth USB Host Controller iMac 11,1
CVS commit: src/usr.bin/kdump
Module Name:src
Committed By: mrg
Date: Sat Jun 2 20:07:15 UTC 2018
Modified Files:
src/usr.bin/kdump: mkioctls
Log Message:
just include for mkioctls. this works fine for me
for several platforms and fixes the clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/kdump/mkioctls
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/kdump/mkioctls
diff -u src/usr.bin/kdump/mkioctls:1.50 src/usr.bin/kdump/mkioctls:1.51
--- src/usr.bin/kdump/mkioctls:1.50 Tue May 29 14:29:53 2018
+++ src/usr.bin/kdump/mkioctls Sat Jun 2 20:07:15 2018
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkioctls,v 1.50 2018/05/29 14:29:53 martin Exp $
+# $NetBSD: mkioctls,v 1.51 2018/06/02 20:07:15 mrg Exp $
#
# Copyright (c) 1994
# The Regents of the University of California. All rights reserved.
@@ -49,10 +49,10 @@ echo "typedef struct crap videomemory_t;
echo "typedef struct crap RF_AccTotals_t;" # XXX Raidframe lossage
echo "struct rf_test_acc { int _xxx; };" # XXX Raidframe lossage
echo "struct map_info { int _xxx[22]; };" # XXX Xorg lossage
-echo "typedef struct kmutex kmutex_t;" # XXX needed by ZFS headers
echo "#include "
echo "#include "
echo "#include "
+echo "#include "
echo "#ifndef NBPG"
echo "#define NBPG 4096 /* workaround / dummy for sparc */"
echo "#endif /* NBPG */"
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: sevan Date: Sat Jun 2 19:28:39 UTC 2018 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: Enabled IPsec & ipsecif(4) support by default. ok macallan To generate a diff of this commit: cvs rdiff -u -r1.346 -r1.347 src/sys/arch/macppc/conf/GENERIC 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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.346 src/sys/arch/macppc/conf/GENERIC:1.347 --- src/sys/arch/macppc/conf/GENERIC:1.346 Fri Mar 16 03:19:38 2018 +++ src/sys/arch/macppc/conf/GENERIC Sat Jun 2 19:28:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.346 2018/03/16 03:19:38 sevan Exp $ +# $NetBSD: GENERIC,v 1.347 2018/06/02 19:28:39 sevan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.346 $" +#ident "GENERIC-$Revision: 1.347 $" maxusers 32 @@ -119,7 +119,7 @@ options NFS_BOOT_DHCP # Support DHCP NF #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast @@ -654,6 +654,7 @@ pseudo-device tun # network tunneling pseudo-device tap # virtual Ethernet #pseudo-device gre # generic L3 over IP tunnel pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) +pseudo-device ipsecif # tunnel interface for routing based ipsec #pseudo-device faith # IPv[46] tcp relay translation i/f pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation
CVS commit: src/share/man/man4
Module Name:src Committed By: sevan Date: Sat Jun 2 19:08:34 UTC 2018 Modified Files: src/share/man/man4: gem.4 Log Message: gem(4) can also be connected to makphy(4), as found on a G4 PowerBook gem0 at pci2 dev 15 function 0: Apple Computer GMAC Ethernet (rev. 0x80) gem0: interrupting at irq 41 makphy0 at gem0 phy 0: Marvell 88E Gigabit PHY, rev. 1 gem0: Ethernet address 00:0a:95:xx:xx:xx, 10KB RX fifo, 4KB TX fifo To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/gem.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/gem.4 diff -u src/share/man/man4/gem.4:1.11 src/share/man/man4/gem.4:1.12 --- src/share/man/man4/gem.4:1.11 Wed May 9 08:04:06 2018 +++ src/share/man/man4/gem.4 Sat Jun 2 19:08:34 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: gem.4,v 1.11 2018/05/09 08:04:06 wiz Exp $ +.\" $NetBSD: gem.4,v 1.12 2018/06/02 19:08:34 sevan Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 15, 2008 +.Dd June 2, 2018 .Dt GEM 4 .Os .Sh NAME @@ -66,6 +66,7 @@ for information on how to enable this fe .Xr bmtphy 4 , .Xr ifmedia 4 , .Xr intro 4 , +.Xr makphy 4 , .Xr mii 4 , .Xr ifconfig 8 .Rs
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Sat Jun 2 18:46:34 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: proc.h systm.h time.h
Log Message:
- Remove more extraneous includes to avoid circular dependencies with the
real header files.
- Add to to avoid changing the source, but
it should really belong to the source.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/proc.h
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/systm.h
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/sys/sys/time.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/proc.h
diff -u src/external/cddl/osnet/sys/sys/proc.h:1.6 src/external/cddl/osnet/sys/sys/proc.h:1.7
--- src/external/cddl/osnet/sys/sys/proc.h:1.6 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/proc.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.6 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: proc.h,v 1.7 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -60,7 +60,6 @@
#ifndef _OPENSOLARIS_SYS_PROC_H_
#define _OPENSOLARIS_SYS_PROC_H_
-#include
#include_next
#include
Index: src/external/cddl/osnet/sys/sys/systm.h
diff -u src/external/cddl/osnet/sys/sys/systm.h:1.5 src/external/cddl/osnet/sys/sys/systm.h:1.6
--- src/external/cddl/osnet/sys/sys/systm.h:1.5 Mon May 28 17:05:10 2018
+++ src/external/cddl/osnet/sys/sys/systm.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.5 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: systm.h,v 1.6 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -57,8 +57,6 @@
* $FreeBSD: head/sys/cddl/compat/opensolaris/sys/systm.h 296510 2016-03-08 17:27:13Z mav $
*/
-#include
-
#ifndef _OPENSOLARIS_SYS_SYSTM_H_
#define _OPENSOLARIS_SYS_SYSTM_H_
@@ -67,10 +65,9 @@
#include_next
#endif
-#include
-
#ifdef _KERNEL
#include
+#include
#define PAGESIZE PAGE_SIZE
#define PAGEOFFSET (PAGESIZE - 1)
Index: src/external/cddl/osnet/sys/sys/time.h
diff -u src/external/cddl/osnet/sys/sys/time.h:1.10 src/external/cddl/osnet/sys/sys/time.h:1.11
--- src/external/cddl/osnet/sys/sys/time.h:1.10 Thu May 31 20:56:19 2018
+++ src/external/cddl/osnet/sys/sys/time.h Sat Jun 2 14:46:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: time.h,v 1.10 2018/06/01 00:56:19 kre Exp $ */
+/* $NetBSD: time.h,v 1.11 2018/06/02 18:46:34 christos Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -62,7 +62,6 @@ typedef longlong_t hrtime_t;
#define NSEC_TO_TICK(nsec) ((nsec) / (NANOSEC / hz))
#ifdef _KERNEL
-#include
static __inline hrtime_t
gethrtime(void) {
CVS commit: src/sys/arch/xen/conf
Module Name:src Committed By: christos Date: Sat Jun 2 18:11:26 UTC 2018 Modified Files: src/sys/arch/xen/conf: Makefile.xen Log Message: disable sanitizers and relro To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/xen/conf/Makefile.xen 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/xen/conf/Makefile.xen diff -u src/sys/arch/xen/conf/Makefile.xen:1.45 src/sys/arch/xen/conf/Makefile.xen:1.46 --- src/sys/arch/xen/conf/Makefile.xen:1.45 Sun Jan 21 03:33:46 2018 +++ src/sys/arch/xen/conf/Makefile.xen Sat Jun 2 14:11:26 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.xen,v 1.45 2018/01/21 08:33:46 maxv Exp $ +# $NetBSD: Makefile.xen,v 1.46 2018/06/02 18:11:26 christos Exp $ # NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp # Makefile for NetBSD @@ -21,7 +21,9 @@ .include "$S/arch/xen/conf/Makefile.arch.inc" USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no -.include +NORELRO= +NOSANITIZER= +.include USE_SSP?= yes
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Sat Jun 2 15:47:22 UTC 2018 Modified Files: src/external/cddl/osnet/sys/sys: param.h Log Message: don't include To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/param.h diff -u src/external/cddl/osnet/sys/sys/param.h:1.4 src/external/cddl/osnet/sys/sys/param.h:1.5 --- src/external/cddl/osnet/sys/sys/param.h:1.4 Mon May 28 17:05:10 2018 +++ src/external/cddl/osnet/sys/sys/param.h Sat Jun 2 11:47:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.4 2018/05/28 21:05:10 chs Exp $ */ +/* $NetBSD: param.h,v 1.5 2018/06/02 15:47:22 christos Exp $ */ /* * Copyright (C) 2007 John Birrell @@ -29,8 +29,6 @@ * */ -#include - #ifndef _COMPAT_OPENSOLARIS_SYS_PARAM_H_ #define _COMPAT_OPENSOLARIS_SYS_PARAM_H_
CVS commit: src/sys/uvm
Module Name:src
Committed By: chs
Date: Sat Jun 2 15:24:55 UTC 2018
Modified Files:
src/sys/uvm: uvm_bio.c
Log Message:
add missing boilerplate for UVMHIST.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.96 src/sys/uvm/uvm_bio.c:1.97
--- src/sys/uvm/uvm_bio.c:1.96 Sat May 26 18:57:35 2018
+++ src/sys/uvm/uvm_bio.c Sat Jun 2 15:24:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.96 2018/05/26 18:57:35 jdolecek Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.97 2018/06/02 15:24:55 chs Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.96 2018/05/26 18:57:35 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.97 2018/06/02 15:24:55 chs Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -816,6 +816,7 @@ ubc_alloc_direct(struct uvm_object *uobj
int error;
int gpflags = flags | PGO_NOTIMESTAMP | PGO_SYNCIO | PGO_ALLPAGES;
int access_type = VM_PROT_READ;
+ UVMHIST_FUNC("ubc_alloc_direct"); UVMHIST_CALLED(ubchist);
if (flags & UBC_WRITE) {
if (flags & UBC_FAULTBUSY)
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat Jun 2 15:19:45 UTC 2018
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Sanitizers don't support static linking.
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/share/mk/bsd.prog.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.312 src/share/mk/bsd.prog.mk:1.313
--- src/share/mk/bsd.prog.mk:1.312 Sun Mar 11 05:56:44 2018
+++ src/share/mk/bsd.prog.mk Sat Jun 2 11:19:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.312 2018/03/11 09:56:44 mrg Exp $
+# $NetBSD: bsd.prog.mk,v 1.313 2018/06/02 15:19:45 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -462,7 +462,10 @@ PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
_DPADD.${_P}= ${DPADD}${DPADD.${_P}}
_LDADD.${_P}= ${LDADD}${LDADD.${_P}}
_LDFLAGS.${_P}= ${LDFLAGS} ${LDFLAGS.${_P}}
+.if ${MKSANITIZER} != "yes"
+# Sanitizers don't support static build.
_LDSTATIC.${_P}= ${LDSTATIC} ${LDSTATIC.${_P}}
+.endif
# Build and install rules
.if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Jun 2 15:09:37 UTC 2018 Modified Files: src/sys/arch/amd64/conf: Makefile.amd64 Log Message: Disable sanitizers for the kernel. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/conf/Makefile.amd64 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/amd64/conf/Makefile.amd64 diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.70 src/sys/arch/amd64/conf/Makefile.amd64:1.71 --- src/sys/arch/amd64/conf/Makefile.amd64:1.70 Wed Apr 18 06:38:47 2018 +++ src/sys/arch/amd64/conf/Makefile.amd64 Sat Jun 2 11:09:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.amd64,v 1.70 2018/04/18 10:38:47 martin Exp $ +# $NetBSD: Makefile.amd64,v 1.71 2018/06/02 15:09:37 christos Exp $ # Makefile for NetBSD # @@ -20,7 +20,8 @@ MACHINE_ARCH=x86_64 USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no -.include +NOSANITIZER= +.include USE_SSP?= yes
CVS commit: src/sys/arch/amd64/stand/prekern
Module Name:src
Committed By: christos
Date: Sat Jun 2 14:31:40 UTC 2018
Modified Files:
src/sys/arch/amd64/stand/prekern: Makefile
Log Message:
Disable MKSANITIZER
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/stand/prekern/Makefile
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/amd64/stand/prekern/Makefile
diff -u src/sys/arch/amd64/stand/prekern/Makefile:1.6 src/sys/arch/amd64/stand/prekern/Makefile:1.7
--- src/sys/arch/amd64/stand/prekern/Makefile:1.6 Sat Dec 23 01:48:30 2017
+++ src/sys/arch/amd64/stand/prekern/Makefile Sat Jun 2 10:31:40 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2017/12/23 06:48:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/02 14:31:40 christos Exp $
PROG= prekern
SRCS= locore.S trap.S prekern.c mm.c console.c elf.c prng.c
NOSSP= # defined
NOPIE= # defined
+NOSANITIZER= # defined
NOMAN= 1
S= ${.CURDIR}/../../../..
@@ -14,7 +15,7 @@ S= ${.CURDIR}/../../../..
BINDIR= /usr/mdec
BINMODE= 444
-.include
+.include
CPPFLAGS+= -I. -I${S} -I${.OBJDIR} -I${.CURDIR}
CPPFLAGS+= -D_STANDALONE
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sat Jun 2 14:30:35 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add NORELRO
To generate a diff of this commit:
cvs rdiff -u -r1.1063 -r1.1064 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.1063 src/share/mk/bsd.own.mk:1.1064
--- src/share/mk/bsd.own.mk:1.1063 Fri Jun 1 21:41:49 2018
+++ src/share/mk/bsd.own.mk Sat Jun 2 10:30:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1063 2018/06/02 01:41:49 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1064 2018/06/02 14:30:35 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -939,7 +939,8 @@ dependall: .NOTMAIN realdepend .MAKE
#
.for var in \
NOCRYPTO NODOC NOHTML NOINFO NOLINKLIB NOLINT NOMAN NONLS NOOBJ NOPIC \
- NOPICINSTALL NOPROFILE NOSHARE NOSTATICLIB NODEBUGLIB NOSANITIZER
+ NOPICINSTALL NOPROFILE NOSHARE NOSTATICLIB NODEBUGLIB NOSANITIZER \
+ NORELRO
.if defined(${var})
MK${var:S/^NO//}:= no
.endif
CVS commit: src/sys/arch/i386/stand
Module Name:src
Committed By: christos
Date: Sat Jun 2 14:30:07 UTC 2018
Modified Files:
src/sys/arch/i386/stand: Makefile.booters Makefile.inc
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/cdboot: Makefile
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/fatboot: Makefile.fat
src/sys/arch/i386/stand/pxeboot: Makefile
Log Message:
- Disable MKSANITIZER
- Redo using NOPIE
- Add NORELRO
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/Makefile.inc
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/cdboot/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/fatboot/Makefile.fat
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/stand/pxeboot/Makefile
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/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.91 src/sys/arch/i386/stand/Makefile.booters:1.92
--- src/sys/arch/i386/stand/Makefile.booters:1.91 Sat Apr 8 15:53:21 2017
+++ src/sys/arch/i386/stand/Makefile.booters Sat Jun 2 10:30:06 2018
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.booters,v 1.91 2017/04/08 19:53:21 christos Exp $
+# $NetBSD: Makefile.booters,v 1.92 2018/06/02 14:30:06 christos Exp $
+NOSANITIZER=
.include
STRIPFLAG=
Index: src/sys/arch/i386/stand/Makefile.inc
diff -u src/sys/arch/i386/stand/Makefile.inc:1.14 src/sys/arch/i386/stand/Makefile.inc:1.15
--- src/sys/arch/i386/stand/Makefile.inc:1.14 Wed Feb 21 20:37:04 2018
+++ src/sys/arch/i386/stand/Makefile.inc Sat Jun 2 10:30:06 2018
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.14 2018/02/22 01:37:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2018/06/02 14:30:06 christos Exp $
+
+NOSANITIZER=
+NOPIE=
+NOMAN=
.include
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.70 src/sys/arch/i386/stand/boot/Makefile.boot:1.71
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.70 Sat Apr 8 15:53:21 2017
+++ src/sys/arch/i386/stand/boot/Makefile.boot Sat Jun 2 10:30:06 2018
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.boot,v 1.70 2017/04/08 19:53:21 christos Exp $
+# $NetBSD: Makefile.boot,v 1.71 2018/06/02 14:30:06 christos Exp $
S= ${.CURDIR}/../../../../..
NOMAN=
+NOSANITIZER=
+NOPIE=
PROG?= boot
NEWVERSWHAT?= "BIOS Boot"
@@ -11,11 +13,7 @@ AFLAGS.biosboot.S= ${${ACTIVE_CC} == "cl
SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
SRCS= ${SOURCES}
-PIE_CFLAGS=
-PIE_AFLAGS=
-PIE_LDFLAGS=
-
-.include
+.include
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.49 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.50
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.49 Thu Aug 20 07:38:27 2015
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Sat Jun 2 10:30:07 2018
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile.bootxx,v 1.49 2015/08/20 11:38:27 uebayasi Exp $
+# $NetBSD: Makefile.bootxx,v 1.50 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../../..
AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
AFLAGS.pbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
+NOPIE=
NOMAN=
+NOSANITIZER=
PROG?= bootxx_${FS}
BINDIR= /usr/mdec
BINMODE= 0444
@@ -23,7 +22,7 @@ BOOTXX_MAXSIZE?= $$(( ${BOOTXX_SECTORS}
SRCS= pbr.S label.S bootxx.S boot1.c
-.include
+.include
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/cdboot/Makefile
diff -u src/sys/arch/i386/stand/cdboot/Makefile:1.14 src/sys/arch/i386/stand/cdboot/Makefile:1.15
--- src/sys/arch/i386/stand/cdboot/Makefile:1.14 Sun Jan 12 10:26:29 2014
+++ src/sys/arch/i386/stand/cdboot/Makefile Sat Jun 2 10:30:07 2018
@@ -1,15 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.15 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../..
AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-NOMAN= # defined
-.include
+.include
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.30 src/sys/arch/i386/stand/dosboot/Makefile:1.31
--- src/sys/arch/i386/stand/dosboot/Makefile:1.30 Sat Jan 23 17:29:29 2016
+++ src/sys/arch/i386/stand/dosboot/Makefile Sat Jun 2 10:30:07
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sat Jun 2 13:30:32 UTC 2018 Modified Files: src/sys/dev/pci: virtio_pci.c Log Message: fix CVS keyword in __KERNEL_RCSID To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/virtio_pci.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/dev/pci/virtio_pci.c diff -u src/sys/dev/pci/virtio_pci.c:1.2 src/sys/dev/pci/virtio_pci.c:1.3 --- src/sys/dev/pci/virtio_pci.c:1.2 Thu Feb 15 19:05:10 2018 +++ src/sys/dev/pci/virtio_pci.c Sat Jun 2 13:30:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: virtio_pci.c,v 1.2 2018/02/15 19:05:10 uwe Exp $ */ +/* $NetBSD: virtio_pci.c,v 1.3 2018/06/02 13:30:32 jakllsch Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD"); +__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.3 2018/06/02 13:30:32 jakllsch Exp $"); #include #include
CVS commit: src/sys/netinet
Module Name:src
Committed By: maxv
Date: Sat Jun 2 11:56:57 UTC 2018
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
Copy more mbuf flags.
To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 src/sys/netinet/ip_output.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/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.305 src/sys/netinet/ip_output.c:1.306
--- src/sys/netinet/ip_output.c:1.305 Tue May 29 17:21:57 2018
+++ src/sys/netinet/ip_output.c Sat Jun 2 11:56:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.305 2018/05/29 17:21:57 maxv Exp $ */
+/* $NetBSD: ip_output.c,v 1.306 2018/06/02 11:56:57 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.305 2018/05/29 17:21:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.306 2018/06/02 11:56:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -863,8 +863,8 @@ ip_fragment(struct mbuf *m, struct ifnet
mhip = mtod(m, struct ip *);
*mhip = *ip;
- /* we must inherit MCAST and BCAST flags */
- m->m_flags |= m0->m_flags & (M_MCAST|M_BCAST);
+ /* we must inherit the flags */
+ m->m_flags |= m0->m_flags & M_COPYFLAGS;
if (hlen > sizeof(struct ip)) {
mhlen = ip_optcopy(ip, mhip) + sizeof(struct ip);
CVS commit: src/doc
Module Name:src Committed By: roy Date: Sat Jun 2 09:45:56 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-7.0.5 To generate a diff of this commit: cvs rdiff -u -r1.1524 -r1.1525 src/doc/3RDPARTY cvs rdiff -u -r1.2390 -r1.2391 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1524 src/doc/3RDPARTY:1.1525 --- src/doc/3RDPARTY:1.1524 Mon May 21 14:48:55 2018 +++ src/doc/3RDPARTY Sat Jun 2 09:45:56 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1524 2018/05/21 14:48:55 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1525 2018/06/02 09:45:56 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -334,8 +334,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 7.0.4 -Current Vers: 7.0.4 +Version: 7.0.5 +Current Vers: 7.0.5 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2390 src/doc/CHANGES:1.2391 --- src/doc/CHANGES:1.2390 Thu May 24 20:04:46 2018 +++ src/doc/CHANGES Sat Jun 2 09:45:56 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2390 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2391 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -158,3 +158,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: gpio(4): Overhauled interrupt support. Added GPIO interrupt capability for Broadcom BCM283x SoCs (e.g. Raspberry Pi). [thorpej 20180519] + dhcpcd: Import 7.0.5. [roy 20180602]
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Sat Jun 2 09:44:27 UTC 2018
Modified Files:
src/external/bsd/dhcpcd/dist/src: bpf.c dhcp.c dhcpcd.c if-options.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/src/bpf.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/src/dhcp.c \
src/external/bsd/dhcpcd/dist/src/if-options.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/bpf.c
diff -u src/external/bsd/dhcpcd/dist/src/bpf.c:1.6 src/external/bsd/dhcpcd/dist/src/bpf.c:1.7
--- src/external/bsd/dhcpcd/dist/src/bpf.c:1.6 Mon Jan 1 11:50:56 2018
+++ src/external/bsd/dhcpcd/dist/src/bpf.c Sat Jun 2 09:44:27 2018
@@ -108,7 +108,7 @@ bpf_open(struct interface *ifp, int (*fi
size_t buf_len;
struct bpf_version pv;
#ifdef BIOCIMMEDIATE
- int flags;
+ unsigned int flags;
#endif
#ifndef O_CLOEXEC
int fd_opts;
@@ -411,7 +411,7 @@ static const struct bpf_insn bpf_arp_eth
/* Make sure the hardware length matches. */
BPF_STMT(BPF_LD + BPF_B + BPF_IND, offsetof(struct arphdr, ar_hln)),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K,
- sizeof((struct ether_arp *)0)->arp_sha, 1, 0),
+ sizeof(((struct ether_arp *)0)->arp_sha), 1, 0),
BPF_STMT(BPF_RET + BPF_K, 0),
};
#define bpf_arp_ether_len __arraycount(bpf_arp_ether)
@@ -540,7 +540,7 @@ static const struct bpf_insn bpf_bootp_e
#define BPF_BOOTP_ETHER_LEN __arraycount(bpf_bootp_ether)
static const struct bpf_insn bpf_bootp_filter[] = {
- /* Make sure it's an IPv4 packet. */
+ /* Make sure it's an optionless IPv4 packet. */
BPF_STMT(BPF_LD + BPF_B + BPF_IND, 0),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0x45, 1, 0),
BPF_STMT(BPF_RET + BPF_K, 0),
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.9 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.10
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.9 Tue Mar 27 06:16:34 2018
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Sat Jun 2 09:44:27 2018
@@ -3276,7 +3276,7 @@ valid_udp_packet(void *data, size_t data
struct bootp_pkt *p;
uint16_t bytes;
- if (data_len < sizeof(p->ip) + sizeof(p->udp)) {
+ if (data_len < sizeof(p->ip)) {
if (from)
from->s_addr = INADDR_ANY;
errno = ERANGE;
@@ -3291,6 +3291,12 @@ valid_udp_packet(void *data, size_t data
}
bytes = ntohs(p->ip.ip_len);
+ /* Check we have a payload */
+ if (bytes <= sizeof(p->ip) + sizeof(p->udp)) {
+ errno = ERANGE;
+ return -1;
+ }
+ /* Check we don't go beyond the payload */
if (bytes > data_len) {
errno = ENOBUFS;
return -1;
@@ -3334,7 +3340,7 @@ dhcp_handlepacket(struct interface *ifp,
state->bpf_flags & RAW_PARTIALCSUM) == -1)
{
if (errno == EINVAL)
- logerrx("%s: UDP checksum failure from %s",
+ logerrx("%s: checksum failure from %s",
ifp->name, inet_ntoa(from));
else
logerr("%s: invalid UDP packet from %s",
Index: src/external/bsd/dhcpcd/dist/src/if-options.c
diff -u src/external/bsd/dhcpcd/dist/src/if-options.c:1.9 src/external/bsd/dhcpcd/dist/src/if-options.c:1.10
--- src/external/bsd/dhcpcd/dist/src/if-options.c:1.9 Wed May 2 22:08:45 2018
+++ src/external/bsd/dhcpcd/dist/src/if-options.c Sat Jun 2 09:44:27 2018
@@ -1360,6 +1360,7 @@ parse_option(struct dhcpcd_ctx *ctx, con
for (sl = 0; sl < ifo->ia_len; sl++) {
if ((arg == NULL && !ifo->ia[sl].iaid_set) ||
(arg != NULL && ifo->ia[sl].iaid_set &&
+ ifo->ia[sl].ia_type == (uint16_t)i &&
ifo->ia[sl].iaid[0] == iaid[0] &&
ifo->ia[sl].iaid[1] == iaid[1] &&
ifo->ia[sl].iaid[2] == iaid[2] &&
@@ -1369,10 +1370,6 @@ parse_option(struct dhcpcd_ctx *ctx, con
break;
}
}
- if (ia && ia->ia_type != (uint16_t)i) {
- logerrx("Cannot mix IA for the same IAID");
- break;
- }
if (ia == NULL) {
ia = reallocarray(ifo->ia,
ifo->ia_len + 1, sizeof(*ifo->ia));
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.10 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.11
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.10 Fri Apr 6 10:47:47 2018
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Sat Jun 2 09:44:27 2018
@@ -770,20 +770,23 @@ dhcpcd_handlecarrier(struct dhcpcd_ctx *
}
static void
-warn_iaid_conflict(struct interface *ifp, uint8_t *iaid)
+warn_iaid_conflict(struct interface *ifp, uint16_t ia_type, uint8_t *iaid)
{
struct interface *ifn;
size_t i;
+ struct if_ia *ia;
TAILQ_FOREACH(ifn, ifp->ctx->ifaces, next) {
if (ifn == ifp || !ifn->active)
continue;
- if (memcmp(ifn->options->iaid, iaid,
+ if (ia_type == 0 &&
+ memcmp(ifn->options->iaid, iaid,
sizeof(ifn->options->iaid)) == 0)
break;
for (i = 0; i < ifn->options->ia_len; i++) {
- if (memcmp(>options->ia[i].iaid,
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Jun 2 09:42:49 UTC 2018 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21397 Log Message: Import dhcpcd-7.0.5 with the following changes: * dhcp: Clarified some checksumming code, style and commentary (thanks to Maxime Villard) * dhcp6: IAID is now unique per IA type rather than global * ip6: if an IA callback causes a fork, exit earlier Status: Vendor Tag: roy Release Tags: dhcpcd-7-0-5 U src/external/bsd/dhcpcd/dist/.arcconfig U src/external/bsd/dhcpcd/dist/.gitignore U src/external/bsd/dhcpcd/dist/BUILDING.md U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/Makefile U src/external/bsd/dhcpcd/dist/Makefile.inc U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/config-null.mk U src/external/bsd/dhcpcd/dist/configure U src/external/bsd/dhcpcd/dist/iconfig.mk U src/external/bsd/dhcpcd/dist/compat/_strtoi.h U src/external/bsd/dhcpcd/dist/compat/arc4random.c U src/external/bsd/dhcpcd/dist/compat/arc4random.h U src/external/bsd/dhcpcd/dist/compat/bitops.h U src/external/bsd/dhcpcd/dist/compat/queue.h U src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.c U src/external/bsd/dhcpcd/dist/compat/arc4random_uniform.h U src/external/bsd/dhcpcd/dist/compat/reallocarray.c U src/external/bsd/dhcpcd/dist/compat/dprintf.c U src/external/bsd/dhcpcd/dist/compat/dprintf.h U src/external/bsd/dhcpcd/dist/compat/endian.h U src/external/bsd/dhcpcd/dist/compat/pidfile.c U src/external/bsd/dhcpcd/dist/compat/pidfile.h U src/external/bsd/dhcpcd/dist/compat/reallocarray.h U src/external/bsd/dhcpcd/dist/compat/strlcpy.c U src/external/bsd/dhcpcd/dist/compat/strlcpy.h U src/external/bsd/dhcpcd/dist/compat/strtoi.c U src/external/bsd/dhcpcd/dist/compat/strtoi.h U src/external/bsd/dhcpcd/dist/compat/strtou.c U src/external/bsd/dhcpcd/dist/compat/crypt/hmac.c U src/external/bsd/dhcpcd/dist/compat/crypt/hmac.h U src/external/bsd/dhcpcd/dist/compat/crypt/md5.c U src/external/bsd/dhcpcd/dist/compat/crypt/md5.h U src/external/bsd/dhcpcd/dist/compat/crypt/sha256.c U src/external/bsd/dhcpcd/dist/compat/crypt/sha256.h C src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/GNUmakefile U src/external/bsd/dhcpcd/dist/src/Makefile U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/auth.c U src/external/bsd/dhcpcd/dist/src/auth.h C src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.c U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/dev.c U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions-small.conf U src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/src/genembedc U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.c U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/if-linux-wext.c U src/external/bsd/dhcpcd/dist/src/genembedh U src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/if-linux.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/if-sun.c U src/external/bsd/dhcpcd/dist/src/if.c U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/ipv4.c U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.c U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.c U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/dev/Makefile U src/external/bsd/dhcpcd/dist/src/dev/udev.c U
