CVS commit: src/sys/uvm
Module Name:src
Committed By: kre
Date: Sun Jan 27 05:22:20 UTC 2019
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
Remove end of line spaces - one (two in one line) added during recent merge,
one older.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/uvm/uvm_swap.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_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.179 src/sys/uvm/uvm_swap.c:1.180
--- src/sys/uvm/uvm_swap.c:1.179 Sun Jan 27 02:08:50 2019
+++ src/sys/uvm/uvm_swap.c Sun Jan 27 05:22:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.179 2019/01/27 02:08:50 pgoyette Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.180 2019/01/27 05:22:19 kre Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.179 2019/01/27 02:08:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.180 2019/01/27 05:22:19 kre Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -427,7 +427,7 @@ swapent_cvt(struct swapent *se, const st
strcpy(se->se_path, sdp->swd_path);
}
-int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *) =
+int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *) =
(void *)enosys;
int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *) =
(void *)enosys;
@@ -708,7 +708,7 @@ out:
* ensure it would fit in the stackgap in any case.
*/
int
-uvm_swap_stats(char *ptr, int misc,
+uvm_swap_stats(char *ptr, int misc,
void (*f)(void *, const struct swapent *), size_t len,
register_t *retval)
{
CVS commit: src/usr.bin/ldd/build
Module Name:src Committed By: kre Date: Sun Jan 27 05:17:48 UTC 2019 Modified Files: src/usr.bin/ldd/build: Makefile Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/ldd/build/Makefile 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/ldd/build/Makefile diff -u src/usr.bin/ldd/build/Makefile:1.4 src/usr.bin/ldd/build/Makefile:1.5 --- src/usr.bin/ldd/build/Makefile:1.4 Sun Jan 27 02:08:50 2019 +++ src/usr.bin/ldd/build/Makefile Sun Jan 27 05:17:48 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/01/27 02:08:50 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.5 2019/01/27 05:17:48 kre Exp $ NOSANITIZER= # defined
CVS commit: src/usr.bin/ldd/elf32
Module Name:src Committed By: kre Date: Sun Jan 27 05:16:55 UTC 2019 Modified Files: src/usr.bin/ldd/elf32: Makefile Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ldd/elf32/Makefile 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/ldd/elf32/Makefile diff -u src/usr.bin/ldd/elf32/Makefile:1.11 src/usr.bin/ldd/elf32/Makefile:1.12 --- src/usr.bin/ldd/elf32/Makefile:1.11 Sun Jan 27 02:08:50 2019 +++ src/usr.bin/ldd/elf32/Makefile Sun Jan 27 05:16:55 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/01/27 02:08:50 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.12 2019/01/27 05:16:55 kre Exp $ NOSANITIZER= # defined
CVS commit: src/tools/m68k-elf2aout
Module Name:src Committed By: dholland Date: Sun Jan 27 05:16:38 UTC 2019 Modified Files: src/tools/m68k-elf2aout: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tools/m68k-elf2aout/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/m68k-elf2aout/Makefile diff -u src/tools/m68k-elf2aout/Makefile:1.4 src/tools/m68k-elf2aout/Makefile:1.5 --- src/tools/m68k-elf2aout/Makefile:1.4 Sun Jan 27 02:08:50 2019 +++ src/tools/m68k-elf2aout/Makefile Sun Jan 27 05:16:38 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/01/27 02:08:50 pgoyette Exp $ - -.include +# $NetBSD: Makefile,v 1.5 2019/01/27 05:16:38 dholland Exp $ .include
CVS commit: src/tools/host-mkdep
Module Name:src Committed By: dholland Date: Sun Jan 27 05:16:10 UTC 2019 Modified Files: src/tools/host-mkdep: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tools/host-mkdep/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/host-mkdep/Makefile diff -u src/tools/host-mkdep/Makefile:1.14 src/tools/host-mkdep/Makefile:1.15 --- src/tools/host-mkdep/Makefile:1.14 Sun Jan 27 02:08:50 2019 +++ src/tools/host-mkdep/Makefile Sun Jan 27 05:16:10 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/01/27 02:08:50 pgoyette Exp $ - -.include +# $NetBSD: Makefile,v 1.15 2019/01/27 05:16:10 dholland Exp $ .include
CVS commit: src/usr.bin/ldd/elf32_compat
Module Name:src Committed By: kre Date: Sun Jan 27 05:15:42 UTC 2019 Modified Files: src/usr.bin/ldd/elf32_compat: Makefile Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/ldd/elf32_compat/Makefile 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/ldd/elf32_compat/Makefile diff -u src/usr.bin/ldd/elf32_compat/Makefile:1.3 src/usr.bin/ldd/elf32_compat/Makefile:1.4 --- src/usr.bin/ldd/elf32_compat/Makefile:1.3 Sun Jan 27 02:08:51 2019 +++ src/usr.bin/ldd/elf32_compat/Makefile Sun Jan 27 05:15:42 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/01/27 02:08:51 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.4 2019/01/27 05:15:42 kre Exp $ NOSANITIZER= # defined
CVS commit: src/tools/compat
Module Name:src Committed By: dholland Date: Sun Jan 27 05:15:32 UTC 2019 Modified Files: src/tools/compat: nbtool_config.h.in Log Message: Restore comment accidentally lost in merge. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.48 src/tools/compat/nbtool_config.h.in:1.49 --- src/tools/compat/nbtool_config.h.in:1.48 Sun Jan 27 02:08:50 2019 +++ src/tools/compat/nbtool_config.h.in Sun Jan 27 05:15:32 2019 @@ -1,5 +1,6 @@ +/* nbtool_config.h.in. Generated from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.48 2019/01/27 02:08:50 pgoyette Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.49 2019/01/27 05:15:32 dholland Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__
CVS commit: src/usr.bin/ldd/elf64
Module Name:src Committed By: kre Date: Sun Jan 27 05:14:45 UTC 2019 Modified Files: src/usr.bin/ldd/elf64: Makefile Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ldd/elf64/Makefile 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/ldd/elf64/Makefile diff -u src/usr.bin/ldd/elf64/Makefile:1.10 src/usr.bin/ldd/elf64/Makefile:1.11 --- src/usr.bin/ldd/elf64/Makefile:1.10 Sun Jan 27 02:08:51 2019 +++ src/usr.bin/ldd/elf64/Makefile Sun Jan 27 05:14:45 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/01/27 02:08:51 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.11 2019/01/27 05:14:45 kre Exp $ NOSANITIZER= # defined
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: kre
Date: Sun Jan 27 05:12:30 UTC 2019
Modified Files:
src/usr.sbin/tprof: Makefile
Log Message:
Fix merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/tprof/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/tprof/Makefile
diff -u src/usr.sbin/tprof/Makefile:1.8 src/usr.sbin/tprof/Makefile:1.9
--- src/usr.sbin/tprof/Makefile:1.8 Sun Jan 27 02:08:51 2019
+++ src/usr.sbin/tprof/Makefile Sun Jan 27 05:12:30 2019
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/01/27 02:08:51 pgoyette Exp $
-
-.PATH: ${.CURDIR}/arch
+# $NetBSD: Makefile,v 1.9 2019/01/27 05:12:30 kre Exp $
.PATH: ${.CURDIR}/arch
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: dholland Date: Sun Jan 27 05:08:58 UTC 2019 Modified Files: src/sys/arch/xen/x86: xen_ipi.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/xen/x86/xen_ipi.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/xen/x86/xen_ipi.c diff -u src/sys/arch/xen/x86/xen_ipi.c:1.30 src/sys/arch/xen/x86/xen_ipi.c:1.31 --- src/sys/arch/xen/x86/xen_ipi.c:1.30 Sun Jan 27 02:08:39 2019 +++ src/sys/arch/xen/x86/xen_ipi.c Sun Jan 27 05:08:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -33,12 +33,10 @@ /* * Based on: x86/ipi.c - * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $"); + * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $"); */ -__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.30 2019/01/27 02:08:39 pgoyette Exp $"); - -#include "opt_ddb.h" +__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $"); #include "opt_ddb.h"
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: dholland Date: Sun Jan 27 05:08:05 UTC 2019 Modified Files: src/sys/arch/x86/x86: spectre.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/spectre.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/x86/x86/spectre.c diff -u src/sys/arch/x86/x86/spectre.c:1.23 src/sys/arch/x86/x86/spectre.c:1.24 --- src/sys/arch/x86/x86/spectre.c:1.23 Sun Jan 27 02:08:39 2019 +++ src/sys/arch/x86/x86/spectre.c Sun Jan 27 05:08:05 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: spectre.c,v 1.23 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: spectre.c,v 1.24 2019/01/27 05:08:05 dholland Exp $ */ /* * Copyright (c) 2018 NetBSD Foundation, Inc. @@ -34,9 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.23 2019/01/27 02:08:39 pgoyette Exp $"); - -#include "opt_spectre.h" +__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.24 2019/01/27 05:08:05 dholland Exp $"); #include "opt_spectre.h"
CVS commit: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl
Module Name:src Committed By: kre Date: Sun Jan 27 05:07:46 UTC 2019 Modified Files: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl: stm32-pinfunc.h Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.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/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h diff -u src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.3 --- src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h:1.2 Sun Jan 27 02:08:43 2019 +++ src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h Sun Jan 27 05:07:46 2019 @@ -1,10 +1,4 @@ -/* $NetBSD: stm32-pinfunc.h,v 1.2 2019/01/27 02:08:43 pgoyette Exp $ */ - -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ -/* - * Copyright (C) STMicroelectronics 2017 - All Rights Reserved - * Author: Torgue Alexandre for STMicroelectronics. - */ +/* $NetBSD: stm32-pinfunc.h,v 1.3 2019/01/27 05:07:46 kre Exp $ */ /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ /*
CVS commit: src/sys/arch/x68k/stand/aout2hux
Module Name:src Committed By: dholland Date: Sun Jan 27 05:06:35 UTC 2019 Modified Files: src/sys/arch/x68k/stand/aout2hux: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/aout2hux/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/x68k/stand/aout2hux/Makefile diff -u src/sys/arch/x68k/stand/aout2hux/Makefile:1.7 src/sys/arch/x68k/stand/aout2hux/Makefile:1.8 --- src/sys/arch/x68k/stand/aout2hux/Makefile:1.7 Sun Jan 27 02:08:39 2019 +++ src/sys/arch/x68k/stand/aout2hux/Makefile Sun Jan 27 05:06:35 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/01/27 02:08:39 pgoyette Exp $ - -.include +# $NetBSD: Makefile,v 1.8 2019/01/27 05:06:35 dholland Exp $ .include
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: kre Date: Sun Jan 27 05:05:37 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: files.radeon Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/radeon/files.radeon 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/radeon/files.radeon diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.23 src/sys/external/bsd/drm2/radeon/files.radeon:1.24 --- src/sys/external/bsd/drm2/radeon/files.radeon:1.23 Sun Jan 27 02:08:43 2019 +++ src/sys/external/bsd/drm2/radeon/files.radeon Sun Jan 27 05:05:37 2019 @@ -1,6 +1,4 @@ -# $NetBSD: files.radeon,v 1.23 2019/01/27 02:08:43 pgoyette Exp $ - -version 20180827 +# $NetBSD: files.radeon,v 1.24 2019/01/27 05:05:37 kre Exp $ version 20180827
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src Committed By: dholland Date: Sun Jan 27 05:04:39 UTC 2019 Modified Files: src/sys/arch/mips/cavium/dev: octeon_fpa.c Log Message: Restore accidentally-dropped opt_octeon.h. (or at least it really looks like it was accidental) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_fpa.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/mips/cavium/dev/octeon_fpa.c diff -u src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.3 src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.4 --- src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.3 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/mips/cavium/dev/octeon_fpa.c Sun Jan 27 05:04:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_fpa.c,v 1.3 2019/01/27 02:08:38 pgoyette Exp $ */ +/* $NetBSD: octeon_fpa.c,v 1.4 2019/01/27 05:04:39 dholland Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -29,7 +29,9 @@ #undef FPADEBUG #include -__KERNEL_RCSID(0, "$NetBSD: octeon_fpa.c,v 1.3 2019/01/27 02:08:38 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_fpa.c,v 1.4 2019/01/27 05:04:39 dholland Exp $"); + +#include "opt_octeon.h" #include #include
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src Committed By: kre Date: Sun Jan 27 05:03:57 UTC 2019 Modified Files: src/sys/external/bsd/drm2/nouveau: files.nouveau Log Message: Fix merge botch To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/drm2/nouveau/files.nouveau 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/nouveau/files.nouveau diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.24 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.25 --- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.24 Sun Jan 27 02:08:43 2019 +++ src/sys/external/bsd/drm2/nouveau/files.nouveau Sun Jan 27 05:03:57 2019 @@ -1,6 +1,4 @@ -# $NetBSD: files.nouveau,v 1.24 2019/01/27 02:08:43 pgoyette Exp $ - -version 20180827 +# $NetBSD: files.nouveau,v 1.25 2019/01/27 05:03:57 kre Exp $ version 20180827
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: kre Date: Sun Jan 27 05:00:48 UTC 2019 Modified Files: src/sys/external/bsd/drm2/i915drm: files.i915drmkms Log Message: Fix merge botch. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/drm2/i915drm/files.i915drmkms 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/i915drm/files.i915drmkms diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.36 --- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.35 Sun Jan 27 02:08:42 2019 +++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Jan 27 05:00:48 2019 @@ -1,6 +1,4 @@ -# $NetBSD: files.i915drmkms,v 1.35 2019/01/27 02:08:42 pgoyette Exp $ - -version 20180827 +# $NetBSD: files.i915drmkms,v 1.36 2019/01/27 05:00:48 kre Exp $ version 20180827
CVS commit: src/sys/arch/macppc/stand/bootxx
Module Name:src Committed By: dholland Date: Sun Jan 27 04:59:12 UTC 2019 Modified Files: src/sys/arch/macppc/stand/bootxx: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/stand/bootxx/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/macppc/stand/bootxx/Makefile diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.20 src/sys/arch/macppc/stand/bootxx/Makefile:1.21 --- src/sys/arch/macppc/stand/bootxx/Makefile:1.20 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/macppc/stand/bootxx/Makefile Sun Jan 27 04:59:12 2019 @@ -1,8 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/01/27 02:08:38 pgoyette Exp $ - -NOLIBCSANITIZER= -NOSANITIZER= -NOPIE= +# $NetBSD: Makefile,v 1.21 2019/01/27 04:59:12 dholland Exp $ NOLIBCSANITIZER= NOSANITIZER=
CVS commit: src/sys/arch/i386/stand
Module Name:src Committed By: dholland Date: Sun Jan 27 04:56:46 UTC 2019 Modified Files: src/sys/arch/i386/stand: Makefile.inc src/sys/arch/i386/stand/genprom: Makefile src/sys/arch/i386/stand/misc: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/genprom/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/stand/misc/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.inc diff -u src/sys/arch/i386/stand/Makefile.inc:1.17 src/sys/arch/i386/stand/Makefile.inc:1.18 --- src/sys/arch/i386/stand/Makefile.inc:1.17 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/i386/stand/Makefile.inc Sun Jan 27 04:56:46 2019 @@ -1,9 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2019/01/27 02:08:38 pgoyette Exp $ - -NOLIBCSANITIZER= -NOSANITIZER= -NOPIE= -NOMAN= +# $NetBSD: Makefile.inc,v 1.18 2019/01/27 04:56:46 dholland Exp $ NOLIBCSANITIZER= NOSANITIZER= Index: src/sys/arch/i386/stand/genprom/Makefile diff -u src/sys/arch/i386/stand/genprom/Makefile:1.9 src/sys/arch/i386/stand/genprom/Makefile:1.10 --- src/sys/arch/i386/stand/genprom/Makefile:1.9 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/i386/stand/genprom/Makefile Sun Jan 27 04:56:46 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/01/27 02:08:38 pgoyette Exp $ - -.include +# $NetBSD: Makefile,v 1.10 2019/01/27 04:56:46 dholland Exp $ .include Index: src/sys/arch/i386/stand/misc/Makefile diff -u src/sys/arch/i386/stand/misc/Makefile:1.10 src/sys/arch/i386/stand/misc/Makefile:1.11 --- src/sys/arch/i386/stand/misc/Makefile:1.10 Sun Jan 27 02:08:38 2019 +++ src/sys/arch/i386/stand/misc/Makefile Sun Jan 27 04:56:46 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/01/27 02:08:38 pgoyette Exp $ - -.include +# $NetBSD: Makefile,v 1.11 2019/01/27 04:56:46 dholland Exp $ .include
CVS commit: src/sys/arch/arm/samsung
Module Name:src Committed By: dholland Date: Sun Jan 27 04:53:59 UTC 2019 Modified Files: src/sys/arch/arm/samsung: exynos_platform.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/samsung/exynos_platform.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/samsung/exynos_platform.c diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.23 src/sys/arch/arm/samsung/exynos_platform.c:1.24 --- src/sys/arch/arm/samsung/exynos_platform.c:1.23 Sun Jan 27 02:08:37 2019 +++ src/sys/arch/arm/samsung/exynos_platform.c Sun Jan 27 04:53:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_platform.c,v 1.23 2019/01/27 02:08:37 pgoyette Exp $ */ +/* $NetBSD: exynos_platform.c,v 1.24 2019/01/27 04:53:59 dholland Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill @@ -35,12 +35,7 @@ #include "ukbd.h" #include -__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.23 2019/01/27 02:08:37 pgoyette Exp $"); - -/* XXXJDM - * Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries. - */ -#define EXYNOS5422_DISABLE_CA7_CLUSTER +__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.24 2019/01/27 04:53:59 dholland Exp $"); /* XXXJDM * Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries.
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: dholland Date: Sun Jan 27 04:52:07 UTC 2019 Modified Files: src/sys/arch/arm/include: asm.h Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/include/asm.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/arch/arm/include/asm.h diff -u src/sys/arch/arm/include/asm.h:1.29 src/sys/arch/arm/include/asm.h:1.30 --- src/sys/arch/arm/include/asm.h:1.29 Sun Jan 27 02:08:37 2019 +++ src/sys/arch/arm/include/asm.h Sun Jan 27 04:52:07 2019 @@ -1,33 +1,4 @@ -/* $NetBSD: asm.h,v 1.29 2019/01/27 02:08:37 pgoyette Exp $ */ - -/*- - * Copyright (c) 2014 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Matt Thomas of 3am Software Foundry. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/* $NetBSD: asm.h,v 1.30 2019/01/27 04:52:07 dholland Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: dholland Date: Sun Jan 27 04:49:12 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: trap.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/trap.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/aarch64/aarch64/trap.c diff -u src/sys/arch/aarch64/aarch64/trap.c:1.15 src/sys/arch/aarch64/aarch64/trap.c:1.16 --- src/sys/arch/aarch64/aarch64/trap.c:1.15 Sun Jan 27 02:08:36 2019 +++ src/sys/arch/aarch64/aarch64/trap.c Sun Jan 27 04:49:12 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $ */ +/* $NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,10 +31,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $"); - -#include "opt_arm_intr_impl.h" -#include "opt_compat_netbsd32.h" +__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $"); #include "opt_arm_intr_impl.h" #include "opt_compat_netbsd32.h"
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: dholland
Date: Sun Jan 27 04:48:09 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: idle_machdep.S
Log Message:
restore accidentally-removed rcsid
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/idle_machdep.S
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/aarch64/aarch64/idle_machdep.S
diff -u src/sys/arch/aarch64/aarch64/idle_machdep.S:1.4 src/sys/arch/aarch64/aarch64/idle_machdep.S:1.5
--- src/sys/arch/aarch64/aarch64/idle_machdep.S:1.4 Sun Jan 27 02:08:36 2019
+++ src/sys/arch/aarch64/aarch64/idle_machdep.S Sun Jan 27 04:48:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: idle_machdep.S,v 1.4 2019/01/27 02:08:36 pgoyette Exp $ */
+/* $NetBSD: idle_machdep.S,v 1.5 2019/01/27 04:48:09 dholland Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
#include "opt_arm_intr_impl.h"
#include "opt_ddb.h"
+RCSID("$NetBSD: idle_machdep.S,v 1.5 2019/01/27 04:48:09 dholland Exp $");
#ifdef ARM_INTR_IMPL
#include ARM_INTR_IMPL
CVS commit: src/rescue
Module Name:src Committed By: dholland Date: Sun Jan 27 04:42:47 UTC 2019 Modified Files: src/rescue: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/rescue/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/Makefile diff -u src/rescue/Makefile:1.36 src/rescue/Makefile:1.37 --- src/rescue/Makefile:1.36 Sun Jan 27 02:08:36 2019 +++ src/rescue/Makefile Sun Jan 27 04:42:46 2019 @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/01/27 02:08:36 pgoyette Exp $ - -NOLIBCSANITIZER= # defined -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.37 2019/01/27 04:42:46 dholland Exp $ NOLIBCSANITIZER= # defined NOSANITIZER= # defined
CVS commit: src/libexec/httpd
Module Name:src Committed By: dholland Date: Sun Jan 27 04:40:57 UTC 2019 Modified Files: src/libexec/httpd: CHANGES Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/libexec/httpd/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.38 src/libexec/httpd/CHANGES:1.39 --- src/libexec/httpd/CHANGES:1.38 Sun Jan 27 02:08:36 2019 +++ src/libexec/httpd/CHANGES Sun Jan 27 04:40:57 2019 @@ -1,37 +1,4 @@ -$NetBSD: CHANGES,v 1.38 2019/01/27 02:08:36 pgoyette Exp $ - -changes in bozohttpd 20190121: - o don't display special files in the directory index. they aren't - served, but links to them are generated. - -changes in bozohttpd 20190116: - o fix CGI '+' parameter handling, some error checking, and a double - free. from rajeev_v_pil...@yahoo.com - o more directory indexing clean up. from rajeev_v_pil...@yahoo.com - -changes in bozohttpd 20181215: - o fix .htpasswd bypass for authenticated users. reported by JP, - from l...@netbsd.org - o avoid possible null dereference when receiving a big request that - timeout. reported by m...@netbsd.org, from l...@netbsd.org - o fix handling of -T option, from l...@netbsd.org - o cleanups and portability improvements, from m...@netbsd.org - o change directory indexing to use html tables, from - rajeev_v_pil...@yahoo.com - -changes in bozohttpd 20181125: - o fixes for option parsing introduced in bozohttpd 20181123 - -changes in bozohttpd 20181121: - o add url remap support via .bzremap file, from mar...@netbsd.org - o handle redirections for any protocol, not just http: - o fix a denial of service attack against header contents, which - is now bounded at 16KiB. reported by JP - o reduce default timeouts, and add expand timeouts to handle the - initial line, each header, and the total time spent - o add -T option to expose new timeout settings - o minor RFC fixes related to timeout handling - o fix special file (.htpasswd, .bz*) bypass. reported by JP +$NetBSD: CHANGES,v 1.39 2019/01/27 04:40:57 dholland Exp $ changes in bozohttpd 20190121: o don't display special files in the directory index. they aren't
CVS commit: src/lib/libnpf
Module Name:src Committed By: dholland Date: Sun Jan 27 04:39:33 UTC 2019 Modified Files: src/lib/libnpf: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libnpf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libnpf/Makefile diff -u src/lib/libnpf/Makefile:1.9 src/lib/libnpf/Makefile:1.10 --- src/lib/libnpf/Makefile:1.9 Sun Jan 27 02:08:35 2019 +++ src/lib/libnpf/Makefile Sun Jan 27 04:39:33 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/01/27 02:08:35 pgoyette Exp $ - -USE_SHLIBDIR= yes +# $NetBSD: Makefile,v 1.10 2019/01/27 04:39:33 dholland Exp $ USE_SHLIBDIR= yes
CVS commit: src/lib/libc/time
Module Name:src
Committed By: dholland
Date: Sun Jan 27 04:38:38 UTC 2019
Modified Files:
src/lib/libc/time: difftime.c localtime.c
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.115 -r1.116 src/lib/libc/time/localtime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/difftime.c
diff -u src/lib/libc/time/difftime.c:1.20 src/lib/libc/time/difftime.c:1.21
--- src/lib/libc/time/difftime.c:1.20 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/time/difftime.c Sun Jan 27 04:38:38 2019
@@ -1,6 +1,4 @@
-/* $NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Return the difference between two timestamps. */
+/* $NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $ */
/* Return the difference between two timestamps. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)difftime.c 8.1";
#else
-__RCSID("$NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.115 src/lib/libc/time/localtime.c:1.116
--- src/lib/libc/time/localtime.c:1.115 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/time/localtime.c Sun Jan 27 04:38:38 2019
@@ -1,6 +1,4 @@
-/* $NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Convert timestamp from time_t to struct tm. */
+/* $NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
CVS commit: src/lib/csu
Module Name:src Committed By: dholland Date: Sun Jan 27 04:35:25 UTC 2019 Modified Files: src/lib/csu: Makefile Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/lib/csu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/Makefile diff -u src/lib/csu/Makefile:1.38 src/lib/csu/Makefile:1.39 --- src/lib/csu/Makefile:1.38 Sun Jan 27 02:08:35 2019 +++ src/lib/csu/Makefile Sun Jan 27 04:35:25 2019 @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/01/27 02:08:35 pgoyette Exp $ - -NOLIBCSANITIZER= # defined -NOSANITIZER= # defined +# $NetBSD: Makefile,v 1.39 2019/01/27 04:35:25 dholland Exp $ NOLIBCSANITIZER= # defined NOSANITIZER= # defined
CVS commit: src/external/public-domain/xz
Module Name:src Committed By: dholland Date: Sun Jan 27 04:34:36 UTC 2019 Modified Files: src/external/public-domain/xz: Makefile.inc Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/xz/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/Makefile.inc diff -u src/external/public-domain/xz/Makefile.inc:1.5 src/external/public-domain/xz/Makefile.inc:1.6 --- src/external/public-domain/xz/Makefile.inc:1.5 Sun Jan 27 02:08:35 2019 +++ src/external/public-domain/xz/Makefile.inc Sun Jan 27 04:34:35 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.5 2019/01/27 02:08:35 pgoyette Exp $ - -.include +# $NetBSD: Makefile.inc,v 1.6 2019/01/27 04:34:35 dholland Exp $ .include
CVS commit: src/external/mpl/bind/dist/lib/isc/tests
Module Name:src
Committed By: dholland
Date: Sun Jan 27 04:33:29 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/tests: regex_test.c
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/isc/tests/regex_test.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/mpl/bind/dist/lib/isc/tests/regex_test.c
diff -u src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.4 src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.5
--- src/external/mpl/bind/dist/lib/isc/tests/regex_test.c:1.4 Sun Jan 27 02:08:35 2019
+++ src/external/mpl/bind/dist/lib/isc/tests/regex_test.c Sun Jan 27 04:33:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: regex_test.c,v 1.4 2019/01/27 02:08:35 pgoyette Exp $ */
+/* $NetBSD: regex_test.c,v 1.5 2019/01/27 04:33:29 dholland Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1132,8 +1132,6 @@ regex_validate(void **state) {
}
assert_int_equal(r, tests[i].expect);
}
-
- return (cmocka_run_group_tests(tests, NULL, NULL));
}
int
CVS commit: src/external/bsd/ntp/dist/sntp
Module Name:src Committed By: dholland Date: Sun Jan 27 04:28:19 UTC 2019 Modified Files: src/external/bsd/ntp/dist/sntp: crypto.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/sntp/crypto.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/ntp/dist/sntp/crypto.c diff -u src/external/bsd/ntp/dist/sntp/crypto.c:1.16 src/external/bsd/ntp/dist/sntp/crypto.c:1.17 --- src/external/bsd/ntp/dist/sntp/crypto.c:1.16 Sun Jan 27 02:08:34 2019 +++ src/external/bsd/ntp/dist/sntp/crypto.c Sun Jan 27 04:28:18 2019 @@ -1,12 +1,4 @@ -/* $NetBSD: crypto.c,v 1.16 2019/01/27 02:08:34 pgoyette Exp $ */ - -/* - * HMS: we need to test: - * - OpenSSL versions, if we are building with them - * - our versions - * - * We may need to test with(out) OPENSSL separately. - */ +/* $NetBSD: crypto.c,v 1.17 2019/01/27 04:28:18 dholland Exp $ */ /* * HMS: we need to test:
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: dholland Date: Sun Jan 27 04:25:37 UTC 2019 Modified Files: src/external/bsd/byacc/dist: defs.h Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/bsd/byacc/dist/defs.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/bsd/byacc/dist/defs.h diff -u src/external/bsd/byacc/dist/defs.h:1.14 src/external/bsd/byacc/dist/defs.h:1.15 --- src/external/bsd/byacc/dist/defs.h:1.14 Sun Jan 27 02:08:33 2019 +++ src/external/bsd/byacc/dist/defs.h Sun Jan 27 04:25:37 2019 @@ -1,6 +1,4 @@ -/* $NetBSD: defs.h,v 1.14 2019/01/27 02:08:33 pgoyette Exp $ */ - -/* Id: defs.h,v 1.60 2017/12/04 17:50:02 erik.b.andersen Exp */ +/* $NetBSD: defs.h,v 1.15 2019/01/27 04:25:37 dholland Exp $ */ /* Id: defs.h,v 1.60 2017/12/04 17:50:02 erik.b.andersen Exp */
CVS commit: src/distrib/amd64/ramdisks/common
Module Name:src Committed By: dholland Date: Sun Jan 27 04:22:46 UTC 2019 Modified Files: src/distrib/amd64/ramdisks/common: Makefile.ramdisk Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/ramdisks/common/Makefile.ramdisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.13 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 --- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.13 Sun Jan 27 02:08:33 2019 +++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Sun Jan 27 04:22:46 2019 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.13 2019/01/27 02:08:33 pgoyette Exp $ - -NOSANITIZER= # defined +# $NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $ NOSANITIZER= # defined
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/man
Module Name:src Committed By: dholland Date: Sun Jan 27 04:21:26 UTC 2019 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/man: OPENSSL_ia32cap.3 Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3:1.19 src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3:1.20 --- src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3:1.19 Sun Jan 27 02:08:33 2019 +++ src/crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 Sun Jan 27 04:21:26 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: OPENSSL_ia32cap.3,v 1.19 2019/01/27 02:08:33 pgoyette Exp $ +.\" $NetBSD: OPENSSL_ia32cap.3,v 1.20 2019/01/27 04:21:26 dholland Exp $ .\" .\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32) .\" @@ -279,14 +279,6 @@ the problem by making build procedure us \& #!/bin/sh \& exec clang \-no\-integrated\-as "$@" .Ve -.SH "NOTES" -.IX Header "NOTES" -Even though \s-1AVX512\s0 support was implemented in llvm 3.6, compilation of -assembly modules apparently requires explicit \-march flag. But then -compiler generates processor-specific code, which in turn contradicts -the mere idea of run-time switch execution facilitated by the variable -in question. Till the limitation is lifted, it's possible to work around -the problem by making build procedure use following script: .PP instead of real clang. In which case it doesn't matter which clang version is used, as it is \s-1GNU\s0 assembler version that will be checked.
CVS commit: src/sys/external/bsd/gnu-efi/dist/lib
Module Name:src Committed By: oster Date: Sun Jan 27 04:17:39 UTC 2019 Modified Files: src/sys/external/bsd/gnu-efi/dist/lib: print.c Log Message: Fix merge issue. (leftover line) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/lib/print.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/gnu-efi/dist/lib/print.c diff -u src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.3 src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.4 --- src/sys/external/bsd/gnu-efi/dist/lib/print.c:1.3 Sun Jan 27 02:08:43 2019 +++ src/sys/external/bsd/gnu-efi/dist/lib/print.c Sun Jan 27 04:17:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.3 2019/01/27 02:08:43 pgoyette Exp $ */ +/* $NetBSD: print.c,v 1.4 2019/01/27 04:17:39 oster Exp $ */ /*++ @@ -532,7 +532,6 @@ Returns: _PoolCatPrint (fmt, args, , _PoolPrint); return spc.str; } ->>> 1.1.1.1.34.1 CHAR16 * PoolPrint (
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: oster Date: Sun Jan 27 04:15:11 UTC 2019 Modified Files: src/usr.sbin/sysinst: defs.h Log Message: Remove extra #ifdef and duplicated set of #ifdef's. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/defs.h diff -u src/usr.sbin/sysinst/defs.h:1.30 src/usr.sbin/sysinst/defs.h:1.31 --- src/usr.sbin/sysinst/defs.h:1.30 Sun Jan 27 02:08:51 2019 +++ src/usr.sbin/sysinst/defs.h Sun Jan 27 04:15:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.30 2019/01/27 02:08:51 pgoyette Exp $ */ +/* $NetBSD: defs.h,v 1.31 2019/01/27 04:15:11 oster Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -368,14 +368,6 @@ int clean_xfer_dir; #if !defined(PKG_ARCH_SUBDIR) #define PKG_ARCH_SUBDIR MACH #endif -#endif - -#if !defined(ARCH_SUBDIR) -#define ARCH_SUBDIR MACH -#endif -#if !defined(PKG_ARCH_SUBDIR) -#define PKG_ARCH_SUBDIR MACH -#endif #if !defined(SYSINST_PKG_HOST) #define SYSINST_PKG_HOST "ftp.NetBSD.org"
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: oster
Date: Sun Jan 27 03:19:42 UTC 2019
Modified Files:
src/external/bsd/flex/dist/src: libmain.c
Log Message:
Remove extra #endif.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/libmain.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/flex/dist/src/libmain.c
diff -u src/external/bsd/flex/dist/src/libmain.c:1.5 src/external/bsd/flex/dist/src/libmain.c:1.6
--- src/external/bsd/flex/dist/src/libmain.c:1.5 Sun Jan 27 02:08:34 2019
+++ src/external/bsd/flex/dist/src/libmain.c Sun Jan 27 03:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libmain.c,v 1.5 2019/01/27 02:08:34 pgoyette Exp $ */
+/* $NetBSD: libmain.c,v 1.6 2019/01/27 03:19:42 oster Exp $ */
/* libmain - flex run-time support library "main" function */
@@ -25,8 +25,7 @@
#ifndef HAVE_NBTOOL_CONFIG_H
#include
#ifdef __RCSID
-__RCSID("$NetBSD: libmain.c,v 1.5 2019/01/27 02:08:34 pgoyette Exp $");
-#endif
+__RCSID("$NetBSD: libmain.c,v 1.6 2019/01/27 03:19:42 oster Exp $");
#endif
#endif
CVS commit: src/external/bsd/flex/dist/src
Module Name:src
Committed By: alnsn
Date: Sun Jan 27 03:01:48 UTC 2019
Modified Files:
src/external/bsd/flex/dist/src: libyywrap.c
Log Message:
Remove extra #endif.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/libyywrap.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/flex/dist/src/libyywrap.c
diff -u src/external/bsd/flex/dist/src/libyywrap.c:1.4 src/external/bsd/flex/dist/src/libyywrap.c:1.5
--- src/external/bsd/flex/dist/src/libyywrap.c:1.4 Sun Jan 27 02:08:34 2019
+++ src/external/bsd/flex/dist/src/libyywrap.c Sun Jan 27 03:01:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libyywrap.c,v 1.4 2019/01/27 02:08:34 pgoyette Exp $ */
+/* $NetBSD: libyywrap.c,v 1.5 2019/01/27 03:01:48 alnsn Exp $ */
/* libyywrap - flex run-time support library "yywrap" function */
@@ -25,8 +25,7 @@
#ifndef HAVE_NBTOOL_CONFIG_H
#include
#ifdef __RCSID
-__RCSID("$NetBSD: libyywrap.c,v 1.4 2019/01/27 02:08:34 pgoyette Exp $");
-#endif
+__RCSID("$NetBSD: libyywrap.c,v 1.5 2019/01/27 03:01:48 alnsn Exp $");
#endif
#endif
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Sun Jan 27 03:00:48 UTC 2019 Modified Files: src/sys/compat/common: ccd_60.c Log Message: make this compile again (enable #if 0 code) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/ccd_60.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/compat/common/ccd_60.c diff -u src/sys/compat/common/ccd_60.c:1.8 src/sys/compat/common/ccd_60.c:1.9 --- src/sys/compat/common/ccd_60.c:1.8 Sat Jan 26 21:08:39 2019 +++ src/sys/compat/common/ccd_60.c Sat Jan 26 22:00:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ccd_60.c,v 1.8 2019/01/27 02:08:39 pgoyette Exp $ */ +/* $NetBSD: ccd_60.c,v 1.9 2019/01/27 03:00:48 christos Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.8 2019/01/27 02:08:39 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.9 2019/01/27 03:00:48 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1 * sizeof (size_t) == sizeof (uint64_t) as CCDIOCSET will * be the same as CCDIOCSET_60 */ -#if 0 static int compat_60_ccdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l, int (*f)(dev_t, u_long, void *, int, struct lwp *)) @@ -91,7 +90,6 @@ compat_60_ccdioctl(dev_t dev, u_long cmd return ENOSYS; } } -#endif void ccd_60_init(void)
CVS commit: src/sys/compat/sys
Module Name:src Committed By: christos Date: Sun Jan 27 02:58:48 UTC 2019 Modified Files: src/sys/compat/sys: cpuio.h Log Message: remove extra ifdef. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/compat/sys/cpuio.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/compat/sys/cpuio.h diff -u src/sys/compat/sys/cpuio.h:1.9 src/sys/compat/sys/cpuio.h:1.10 --- src/sys/compat/sys/cpuio.h:1.9 Sat Jan 26 21:08:41 2019 +++ src/sys/compat/sys/cpuio.h Sat Jan 26 21:58:47 2019 @@ -1,7 +1,4 @@ -/* $NetBSD: cpuio.h,v 1.9 2019/01/27 02:08:41 pgoyette Exp $ */ - -#ifndef _SYS_COMPAT_CPUIO_H_ -#define _SYS_COMPAT_CPUIO_H_ +/* $NetBSD: cpuio.h,v 1.10 2019/01/27 02:58:47 christos Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Sun Jan 27 02:55:26 UTC 2019 Modified Files: src/sys/kern: kern_stub.c Log Message: remove extra #endif To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_stub.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/kern/kern_stub.c diff -u src/sys/kern/kern_stub.c:1.46 src/sys/kern/kern_stub.c:1.47 --- src/sys/kern/kern_stub.c:1.46 Sat Jan 26 21:08:43 2019 +++ src/sys/kern/kern_stub.c Sat Jan 26 21:55:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_stub.c,v 1.46 2019/01/27 02:08:43 pgoyette Exp $ */ +/* $NetBSD: kern_stub.c,v 1.47 2019/01/27 02:55:26 christos Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.46 2019/01/27 02:08:43 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.47 2019/01/27 02:55:26 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_ktrace.h" @@ -101,7 +101,6 @@ __strong_alias(shmctl1,enosys); __strong_alias(semctl1,enosys); #endif #endif -#endif /* * ktrace stubs. ktruser() goes to enosys as we want to fail the syscall,
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Sun Jan 27 02:55:02 UTC 2019 Modified Files: src/sys/compat/netbsd32: files.netbsd32 Log Message: remove dup To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/compat/netbsd32/files.netbsd32 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/files.netbsd32 diff -u src/sys/compat/netbsd32/files.netbsd32:1.43 src/sys/compat/netbsd32/files.netbsd32:1.44 --- src/sys/compat/netbsd32/files.netbsd32:1.43 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/files.netbsd32 Sat Jan 26 21:55:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.netbsd32,v 1.43 2019/01/27 02:08:40 pgoyette Exp $ +# $NetBSD: files.netbsd32,v 1.44 2019/01/27 02:55:02 christos Exp $ # # config file description for machine-independent netbsd32 compat code. # included by ports that need it. @@ -49,7 +49,6 @@ file compat/netbsd32/netbsd32_compat_20. file compat/netbsd32/netbsd32_compat_30.c compat_netbsd32 & compat_30 file compat/netbsd32/netbsd32_compat_40.c compat_netbsd32 & compat_40 file compat/netbsd32/netbsd32_compat_43.c compat_netbsd32 & (compat_43 | compat_sunos | compat_linux32) -file compat/netbsd32/netbsd32_compat_40.c compat_netbsd32 & compat_40 file compat/netbsd32/netbsd32_compat_50.c compat_netbsd32 & compat_50 file compat/netbsd32/netbsd32_rndpseudo_50.c compat_netbsd32 & compat_50 file compat/netbsd32/netbsd32_compat_50_sysv.c compat_netbsd32 & compat_50 &
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Sun Jan 27 02:47:26 UTC 2019
Modified Files:
src/sys/sys: cdefs.h
Log Message:
lint understands attributes.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/sys/cdefs.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/cdefs.h
diff -u src/sys/sys/cdefs.h:1.139 src/sys/sys/cdefs.h:1.140
--- src/sys/sys/cdefs.h:1.139 Tue Dec 18 11:23:20 2018
+++ src/sys/sys/cdefs.h Sat Jan 26 21:47:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.139 2018/12/18 16:23:20 skrll Exp $ */
+/* $NetBSD: cdefs.h,v 1.140 2019/01/27 02:47:26 christos Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -210,7 +210,7 @@
#define __attribute__(x)
#endif
-#if __GNUC_PREREQ__(2, 5)
+#if __GNUC_PREREQ__(2, 5) || defined(__lint__)
#define __dead __attribute__((__noreturn__))
#elif defined(__GNUC__)
#define __dead __volatile
@@ -218,7 +218,7 @@
#define __dead
#endif
-#if __GNUC_PREREQ__(2, 96)
+#if __GNUC_PREREQ__(2, 96) || defined(__lint__)
#define __pure __attribute__((__pure__))
#elif defined(__GNUC__)
#define __pure __const
@@ -226,31 +226,31 @@
#define __pure
#endif
-#if __GNUC_PREREQ__(2, 5)
+#if __GNUC_PREREQ__(2, 5) || defined(__lint__)
#define __constfunc __attribute__((__const__))
#else
#define __constfunc
#endif
-#if __GNUC_PREREQ__(3, 0)
+#if __GNUC_PREREQ__(3, 0) || defined(__lint__)
#define __noinline __attribute__((__noinline__))
#else
#define __noinline /* nothing */
#endif
-#if __GNUC_PREREQ__(3, 0)
+#if __GNUC_PREREQ__(3, 0) || defined(__lint__)
#define __always_inline __attribute__((__always_inline__))
#else
#define __always_inline /* nothing */
#endif
-#if __GNUC_PREREQ__(4, 1)
+#if __GNUC_PREREQ__(4, 1) || defined(__lint__)
#define __returns_twice __attribute__((__returns_twice__))
#else
#define __returns_twice /* nothing */
#endif
-#if __GNUC_PREREQ__(4, 5)
+#if __GNUC_PREREQ__(4, 5) || defined(__lint__)
#define __noclone __attribute__((__noclone__))
#else
#define __noclone /* nothing */
@@ -268,7 +268,7 @@
/*
* __used: Note that item is needed, even if it appears to be unused.
*/
-#if __GNUC_PREREQ__(3, 1)
+#if __GNUC_PREREQ__(3, 1) || defined(__lint__)
#define __used __attribute__((__used__))
#else
#define __used __unused
@@ -295,13 +295,13 @@
#define __debugused __unused
#endif
-#if __GNUC_PREREQ__(3, 1)
+#if __GNUC_PREREQ__(3, 1) || defined(__lint__)
#define __noprofile __attribute__((__no_instrument_function__))
#else
#define __noprofile /* nothing */
#endif
-#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
+#if __GNUC_PREREQ__(4, 6) || defined(__clang__) || defined(__lint__)
#define __unreachable() __builtin_unreachable()
#else
#define __unreachable() do {} while (/*CONSTCOND*/0)
@@ -339,7 +339,7 @@
#define __static_cast(x,y) (x)y
#endif
-#if __GNUC_PREREQ__(4, 0)
+#if __GNUC_PREREQ__(4, 0) || defined(__lint__)
# define __dso_public __attribute__((__visibility__("default")))
# define __dso_hidden __attribute__((__visibility__("hidden")))
# define __BEGIN_PUBLIC_DECLS \
@@ -356,7 +356,7 @@
# define __BEGIN_HIDDEN_DECLS __BEGIN_EXTERN_C
# define __END_HIDDEN_DECLS __END_EXTERN_C
#endif
-#if __GNUC_PREREQ__(4, 2)
+#if __GNUC_PREREQ__(4, 2) || defined(__lint__)
# define __dso_protected __attribute__((__visibility__("protected")))
#else
# define __dso_protected
@@ -387,7 +387,7 @@
#define __packed __packed
#define __aligned(x) /* delete */
#define __section(x) /* delete */
-#elif __GNUC_PREREQ__(2, 7) || defined(__PCC__)
+#elif __GNUC_PREREQ__(2, 7) || defined(__PCC__) || defined(__lint__)
#define __packed __attribute__((__packed__))
#define __aligned(x) __attribute__((__aligned__(x)))
#define __section(x) __attribute__((__section__(x)))
@@ -407,7 +407,7 @@
#define __restrict /* delete __restrict when not supported */
#elif __STDC_VERSION__ >= 199901L
#define __restrict restrict
-#elif __GNUC_PREREQ__(2, 92)
+#elif __GNUC_PREREQ__(2, 92) || defined(__lint__)
#define __restrict __restrict__
#else
#define __restrict /* delete __restrict when not supported */
@@ -418,7 +418,7 @@
* available in GCC 2.95.
*/
#if !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L)
-#if __GNUC_PREREQ__(2, 4)
+#if __GNUC_PREREQ__(2, 4) || defined(__lint__)
#define __func__ __FUNCTION__
#else
#define __func__ ""
@@ -449,7 +449,7 @@
* register values. This is gcc specific, the version is more or less
* arbitrary, might work with older compilers.
*/
-#if __GNUC_PREREQ__(2, 95)
+#if __GNUC_PREREQ__(2, 95) || defined(__lint__)
#define __insn_barrier() __asm __volatile("":::"memory")
#else
#define __insn_barrier() /* */
@@ -483,7 +483,7 @@
* basic block reordering that this affects can often generate
* larger code.
*/
-#if __GNUC_PREREQ__(2, 96)
+#if
CVS commit: src/lib/libc/arch/m68k/gen
Module Name:src
Committed By: dholland
Date: Sun Jan 27 02:42:32 UTC 2019
Modified Files:
src/lib/libc/arch/m68k/gen: fabs.S
Log Message:
fix another mergeo
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/m68k/gen/fabs.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/m68k/gen/fabs.S
diff -u src/lib/libc/arch/m68k/gen/fabs.S:1.13 src/lib/libc/arch/m68k/gen/fabs.S:1.14
--- src/lib/libc/arch/m68k/gen/fabs.S:1.13 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/arch/m68k/gen/fabs.S Sun Jan 27 02:42:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $ */
+/* $NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -32,11 +32,7 @@
#include
#include
-RCSID("$NetBSD: fabs.S,v 1.13 2019/01/27 02:08:35 pgoyette Exp $")
-
-#ifndef __HAVE_LONG_DOUBLE
-STRONG_ALIAS(fabsl, fabs)
-#endif
+RCSID("$NetBSD: fabs.S,v 1.14 2019/01/27 02:42:32 dholland Exp $")
#ifndef __HAVE_LONG_DOUBLE
STRONG_ALIAS(fabsl, fabs)
CVS commit: src/lib/libc/time
Module Name:src
Committed By: dholland
Date: Sun Jan 27 02:40:50 UTC 2019
Modified Files:
src/lib/libc/time: asctime.c
Log Message:
fix mergeo
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/time/asctime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/asctime.c
diff -u src/lib/libc/time/asctime.c:1.26 src/lib/libc/time/asctime.c:1.27
--- src/lib/libc/time/asctime.c:1.26 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/time/asctime.c Sun Jan 27 02:40:49 2019
@@ -1,6 +1,4 @@
-/* $NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000. */
+/* $NetBSD: asctime.c,v 1.27 2019/01/27 02:40:49 dholland Exp $ */
/* asctime and asctime_r a la POSIX and ISO C, except pad years before 1000. */
@@ -20,7 +18,7 @@
#if 0
static char elsieid[] = "@(#)asctime.c 8.5";
#else
-__RCSID("$NetBSD: asctime.c,v 1.26 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: asctime.c,v 1.27 2019/01/27 02:40:49 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
CVS commit: [pgoyette-compat] src/sys/sys
Module Name:src Committed By: pgoyette Date: Sun Jan 27 02:37:07 UTC 2019 Modified Files: src/sys/sys [pgoyette-compat]: param.h Log Message: Update version on the branch, too To generate a diff of this commit: cvs rdiff -u -r1.557.2.11 -r1.557.2.12 src/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/sys/sys/param.h diff -u src/sys/sys/param.h:1.557.2.11 src/sys/sys/param.h:1.557.2.12 --- src/sys/sys/param.h:1.557.2.11 Sat Jan 26 22:00:37 2019 +++ src/sys/sys/param.h Sun Jan 27 02:37:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.557.2.11 2019/01/26 22:00:37 pgoyette Exp $ */ +/* $NetBSD: param.h,v 1.557.2.12 2019/01/27 02:37:07 pgoyette Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899003100 /* NetBSD 8.99.31 */ +#define __NetBSD_Version__ 899003200 /* NetBSD 8.99.32 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys/sys
Module Name:src Committed By: pgoyette Date: Sun Jan 27 02:35:49 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Belated bump of kernel version, for merge of [pgoyette-compat] To generate a diff of this commit: cvs rdiff -u -r1.579 -r1.580 src/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/sys/sys/param.h diff -u src/sys/sys/param.h:1.579 src/sys/sys/param.h:1.580 --- src/sys/sys/param.h:1.579 Sun Jan 27 02:08:50 2019 +++ src/sys/sys/param.h Sun Jan 27 02:35:49 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.579 2019/01/27 02:08:50 pgoyette Exp $ */ +/* $NetBSD: param.h,v 1.580 2019/01/27 02:35:49 pgoyette Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899003100 /* NetBSD 8.99.31 */ +#define __NetBSD_Version__ 899003200 /* NetBSD 8.99.32 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src
Module Name:src Committed By: pgoyette Date: Sun Jan 27 02:08:51 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/dist: addrmatch.c auth-bsdauth.c auth-krb5.c auth-options.c auth-passwd.c auth-rhosts.c auth.c auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bitmap.c channels.c cipher-ctr-mt.c cipher.c cleanup.c clientloop.c compat.c dh.c dns.c fmt_scaled.c gss-serv-krb5.c gss-serv.c hostfile.c kex.c kexdhc.c kexdhs.c kexecdhc.c kexecdhs.c kexgexc.c kexgexs.c krl.c log.c match.c misc.c moduli.c monitor.c monitor_wrap.c msg.c mux.c opacket.c packet.c readconf.c readpass.c readpassphrase.c scp.c serverloop.c session.c sftp-client.c sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-rsa.c ssh.c sshconnect.c sshconnect2.c sshd.c sshkey-xmss.c sshkey.c sshlogin.c ttymodes.c uidswap.c umac.c utf8.c xmss_wots.c src/crypto/external/bsd/openssl/lib/libcrypto/man: OPENSSL_ia32cap.3 SSL_read.3 src/distrib/amd64/ramdisks/common: Makefile.ramdisk src/distrib/sets/lists/modules: ad.arm ad.mips md.amd64 md.sparc64 mi src/external/bsd/byacc/dist: defs.h main.c src/external/bsd/file/dist/src: print.c src/external/bsd/flex/dist/src: libmain.c libyywrap.c src/external/bsd/libpcap/dist: scanner.l src/external/bsd/ntp/dist/lib/isc: sha1.c src/external/bsd/ntp/dist/lib/isc/include/isc: sha1.h src/external/bsd/ntp/dist/sntp: crypto.c src/external/bsd/ntp/dist/sntp/libevent/compat/sys: queue.h src/external/bsd/ntp/dist/util: tg2.c src/external/bsd/nvi/dist/vi: vi.c src/external/cddl/osnet/dev/fbt: fbt.c src/external/cddl/osnet/lib/libzfs: deviceid.c fsshare.c mnttab.c src/external/cddl/osnet/sys/kern: kobj.c src/external/mpl/bind/dist/lib/dns/tests: dispatch_test.c dst_test.c rdataset_test.c update_test.c zt_test.c src/external/mpl/bind/dist/lib/isc/tests: buffer_test.c counter_test.c heap_test.c lex_test.c pool_test.c regex_test.c result_test.c taskpool_test.c src/external/mpl/bind/dist/lib/ns/tests: notify_test.c query_test.c src/external/public-domain/xz: Makefile.inc src/lib/csu: Makefile src/lib/libc/arch/m68k/gen: fabs.S src/lib/libc/sys: modctl.2 src/lib/libc/time: asctime.c difftime.c localtime.c zdump.c src/lib/libnpf: Makefile src/lib/libnvmm: libnvmm_x86.c src/libexec/httpd: CHANGES src/rescue: Makefile src/sbin/modstat: main.c modstat.8 src/share/man/man9: module.9 src/sys/arch/aarch64/aarch64: aarch64_machdep.c bus_space.c db_disasm.c db_interface.c db_machdep.c db_trace.c idle_machdep.S locore.S netbsd32_machdep.c trap.c src/sys/arch/aarch64/conf: files.aarch64 src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c trap.c src/sys/arch/amd64/conf: files.amd64 src/sys/arch/amiga/stand/loadkmap/din: Makefile src/sys/arch/arm/arm32: arm11_pmc.c arm32_boot.c cortex_pmc.c cpu.c netbsd32_machdep.c src/sys/arch/arm/conf: files.arm src/sys/arch/arm/include: asm.h src/sys/arch/arm/samsung: exynos_platform.c src/sys/arch/arm/sunxi: sunxi_hdmi.c src/sys/arch/arm/vfp: vfp_init.c src/sys/arch/evbarm/conf: files.generic files.generic64 src/sys/arch/i386/stand: Makefile.inc src/sys/arch/i386/stand/genprom: Makefile src/sys/arch/i386/stand/misc: Makefile src/sys/arch/macppc/stand/bootxx: Makefile src/sys/arch/mips/cavium/dev: octeon_fpa.c src/sys/arch/mips/conf: files.mips src/sys/arch/mips/mips: netbsd32_machdep.c src/sys/arch/sparc/fpu: fpu.c src/sys/arch/sparc64/conf: files.sparc64 src/sys/arch/sparc64/sparc64: netbsd32_machdep.c src/sys/arch/x68k/stand/aout2hux: Makefile src/sys/arch/x86/x86: cpu_ucode.c cpu_ucode_amd.c cpu_ucode_intel.c spectre.c src/sys/arch/xen/conf: files.xen src/sys/arch/xen/x86: xen_ipi.c xen_shm_machdep.c src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c files.aoutm68k syscalls.master src/sys/compat/common: Makefile Makefile.inc Makefile.sysio ccd_60.c compat_exec.c compat_mod.c compat_mod.h compat_util.c compat_util.h if_43.c kern_50.c kern_cpu_60.c kern_exit_43.c kern_info_09.c kern_info_43.c kern_ipc_10.c
CVS commit: src/bin/sleep
Module Name:src
Committed By: christos
Date: Sun Jan 27 02:00:45 UTC 2019
Modified Files:
src/bin/sleep: sleep.c
Log Message:
cast to intmax_t instead of long, since time_t is "long long"
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/bin/sleep/sleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.28 src/bin/sleep/sleep.c:1.29
--- src/bin/sleep/sleep.c:1.28 Sat Jan 26 13:14:22 2019
+++ src/bin/sleep/sleep.c Sat Jan 26 21:00:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.28 2019/01/26 18:14:22 martin Exp $ */
+/* $NetBSD: sleep.c,v 1.29 2019/01/27 02:00:45 christos Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: sleep.c,v 1.28 2019/01/26 18:14:22 martin Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.29 2019/01/27 02:00:45 christos Exp $");
#endif
#endif /* not lint */
@@ -197,16 +197,16 @@ report(const time_t remain, const time_t
{
if (remain == 0)
warnx("In the final moments of the original"
- " %ld%s second%s", (long)original, msg,
+ " %jd%s second%s", (intmax_t)original, msg,
original == 1 && *msg == '\0' ? "" : "s");
else if (remain < 2000)
- warnx("Between %ld and %ld seconds left"
+ warnx("Between %jd and %jd seconds left"
" out of the original %g%s",
- (long)remain, (long)remain + 1, (double)original,
+ (intmax_t)remain, (intmax_t)remain + 1, (double)original,
msg);
else if ((original - remain) < 10 && (original-remain) < original/8)
- warnx("Have waited only %d seconds of the original %g",
- (int)(original - remain), (double)original);
+ warnx("Have waited only %jd seconds of the original %g",
+ (intmax_t)(original - remain), (double)original);
else
warnx("Approximately %g seconds left out of the original %g",
(double)remain, (double)original);
CVS commit: src/external/mpl/dhcp/dist/omapip
Module Name:src
Committed By: christos
Date: Sun Jan 27 01:51:50 UTC 2019
Modified Files:
src/external/mpl/dhcp/dist/omapip: buffer.c dispatch.c
Log Message:
apparently the fdwatch crap is needed, so undo the ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/omapip/buffer.c \
src/external/mpl/dhcp/dist/omapip/dispatch.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/mpl/dhcp/dist/omapip/buffer.c
diff -u src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 src/external/mpl/dhcp/dist/omapip/buffer.c:1.4
--- src/external/mpl/dhcp/dist/omapip/buffer.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/buffer.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* buffer.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: buffer.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: buffer.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -341,7 +341,6 @@ isc_result_t omapi_connection_copyin (om
status = ISC_R_SUCCESS;
leave:
-#if 0
/*
* If we have any bytes to send and we have a proper io object
* inform the socket code that we would like to know when we
@@ -355,7 +354,6 @@ isc_result_t omapi_connection_copyin (om
ISC_SOCKFDWATCH_WRITE);
}
}
-#endif
return (status);
}
Index: src/external/mpl/dhcp/dist/omapip/dispatch.c
diff -u src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 src/external/mpl/dhcp/dist/omapip/dispatch.c:1.4
--- src/external/mpl/dhcp/dist/omapip/dispatch.c:1.3 Thu Jan 10 12:41:47 2019
+++ src/external/mpl/dhcp/dist/omapip/dispatch.c Sat Jan 26 20:51:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $ */
/* dispatch.c
@@ -29,7 +29,7 @@
*/
#include
-__RCSID("$NetBSD: dispatch.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: dispatch.c,v 1.4 2019/01/27 01:51:50 christos Exp $");
#include "dhcpd.h"
@@ -121,7 +121,6 @@ trigger_event(struct eventqueue **queue)
* 1 is delete, 0 is leave in place
*/
#define SOCKDELETE 1
-#ifdef ISC_SOCKFDWATCH_READ
static int
omapi_iscsock_cb(isc_task_t *task,
isc_socket_t *socket,
@@ -198,7 +197,6 @@ omapi_iscsock_cb(isc_task_t *task,
*/
return (0);
}
-#endif
/* Register an I/O handle so that we can do asynchronous I/O on it. */
@@ -214,9 +212,7 @@ isc_result_t omapi_register_io_object (o
{
isc_result_t status;
omapi_io_object_t *obj, *p;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0, fd = 0;
-#endif
/* omapi_io_states is a static object. If its reference count
is zero, this is the first I/O handle to be registered, so
@@ -254,7 +250,6 @@ isc_result_t omapi_register_io_object (o
* a write socket we asssume they are the same socket.
*/
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
fd = readfd(h);
@@ -283,7 +278,6 @@ isc_result_t omapi_register_io_object (o
return (status);
}
}
-#endif
/* Find the last I/O state, if there are any. */
@@ -324,9 +318,7 @@ isc_result_t omapi_reregister_io_object
(omapi_object_t *))
{
omapi_io_object_t *obj;
-#ifdef ISC_SOCKFDWATCH_READ
int fd_flags = 0;
-#endif
if ((!h -> outer) || (h -> outer -> type != omapi_type_io_object)) {
/*
@@ -352,7 +344,6 @@ isc_result_t omapi_reregister_io_object
obj->writer = writer;
obj->reaper = reaper;
-#ifdef ISC_SOCKFDWATCH_READ
if (readfd) {
fd_flags |= ISC_SOCKFDWATCH_READ;
}
@@ -362,7 +353,6 @@ isc_result_t omapi_reregister_io_object
}
isc_socket_fdwatchpoke(obj->fd, fd_flags);
-#endif
return (ISC_R_SUCCESS);
}
CVS commit: src/external/mpl/bind/dist/lib/isc
Module Name:src
Committed By: christos
Date: Sun Jan 27 01:51:00 UTC 2019
Modified Files:
src/external/mpl/bind/dist/lib/isc/include/isc: socket.h
src/external/mpl/bind/dist/lib/isc/unix: socket.c
Log Message:
graft back the fdwatch crap that dhcpd needs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isc/include/isc/socket.h
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/isc/unix/socket.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/mpl/bind/dist/lib/isc/include/isc/socket.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.3 src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.4
--- src/external/mpl/bind/dist/lib/isc/include/isc/socket.h:1.3 Wed Jan 9 11:55:15 2019
+++ src/external/mpl/bind/dist/lib/isc/include/isc/socket.h Sat Jan 26 20:51:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.3 2019/01/09 16:55:15 christos Exp $ */
+/* $NetBSD: socket.h,v 1.4 2019/01/27 01:51:00 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -245,7 +245,8 @@ typedef enum {
isc_sockettype_udp = 1,
isc_sockettype_tcp = 2,
isc_sockettype_unix = 3,
- isc_sockettype_raw = 4
+ isc_sockettype_raw = 4,
+ isc_sockettype_fdwatch = 5
} isc_sockettype_t;
/*@{*/
@@ -1039,6 +1040,82 @@ isc_socketmgr_renderjson(isc_socketmgr_t
*/
typedef isc_result_t
(*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp);
+/*!
+ * Flags for fdwatchcreate.
+ */
+#define ISC_SOCKFDWATCH_READ 0x0001 /*%< watch for readable */
+#define ISC_SOCKFDWATCH_WRITE 0x0002 /*%< watch for writable */
+/*@}*/
+
+isc_result_t
+isc_socket_fdwatchcreate(isc_socketmgr_t *manager,
+ int fd,
+ int flags,
+ isc_sockfdwatch_t callback,
+ void *cbarg,
+ isc_task_t *task,
+ isc_socket_t **socketp);
+/*%<
+ * Create a new file descriptor watch socket managed by 'manager'.
+ *
+ * Note:
+ *
+ *\li 'fd' is the already-opened file descriptor (must be less
+ * than maxsockets).
+ *\li This function is not available on Windows.
+ *\li The callback function is called "in-line" - this means the function
+ * needs to return as fast as possible, as all other I/O will be suspended
+ * until the callback completes.
+ *
+ * Requires:
+ *
+ *\li 'manager' is a valid manager
+ *
+ *\li 'socketp' is a valid pointer, and *socketp == NULL
+ *
+ *\li 'fd' be opened.
+ *
+ * Ensures:
+ *
+ * '*socketp' is attached to the newly created fdwatch socket
+ *
+ * Returns:
+ *
+ *\li #ISC_R_SUCCESS
+ *\li #ISC_R_NOMEMORY
+ *\li #ISC_R_NORESOURCES
+ *\li #ISC_R_UNEXPECTED
+ *\li #ISC_R_RANGE
+ */
+
+isc_result_t
+isc_socket_fdwatchpoke(isc_socket_t *sock,
+ int flags);
+/*%<
+ * Poke a file descriptor watch socket informing the manager that it
+ * should restart watching the socket
+ *
+ * Note:
+ *
+ *\li 'sock' is the socket returned by isc_socket_fdwatchcreate
+ *
+ *\li 'flags' indicates what the manager should watch for on the socket
+ * in addition to what it may already be watching. It can be one or
+ * both of ISC_SOCKFDWATCH_READ and ISC_SOCKFDWATCH_WRITE. To
+ * temporarily disable watching on a socket the value indicating
+ * no more data should be returned from the call back routine.
+ *
+ *\li This function is not available on Windows.
+ *
+ * Requires:
+ *
+ *\li 'sock' is a valid isc socket
+ *
+ *
+ * Returns:
+ *
+ *\li #ISC_R_SUCCESS
+ */
ISC_LANG_ENDDECLS
Index: src/external/mpl/bind/dist/lib/isc/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.4 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.5
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.4 Wed Jan 9 11:55:17 2019
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Sat Jan 26 20:51:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.4 2019/01/09 16:55:17 christos Exp $ */
+/* $NetBSD: socket.c,v 1.5 2019/01/27 01:51:00 christos Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -351,6 +351,14 @@ struct isc__socket {
charname[16];
void *tag;
+ /*
+ * Internal events. Posted when a descriptor is readable or
+ * writable. These are statically allocated and never freed.
+ * They will be set to non-purgable before use.
+ */
+ intev_t readable_ev;
+ intev_t writable_ev;
+
ISC_LIST(isc_socketevent_t) send_list;
ISC_LIST(isc_socketevent_t) recv_list;
ISC_LIST(isc_socket_newconnev_t) accept_list;
@@ -358,7 +366,9 @@ struct isc__socket {
isc_sockaddr_t peer_address; /* remote address */
- unsigned int listener : 1, /* listener socket */
+ unsigned int pending_recv : 1,
+pending_send : 1,
+listener : 1, /* listener socket */
connected : 1,
connecting : 1, /* connect pending */
bound : 1, /* bound to local addr */
@@ -370,6 +380,10 @@
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sat Jan 26 18:30:48 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some RADEON devices. Mainly taken from OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.1358 -r1.1359 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.1358 src/sys/dev/pci/pcidevs:1.1359 --- src/sys/dev/pci/pcidevs:1.1358 Mon Jan 21 04:15:22 2019 +++ src/sys/dev/pci/pcidevs Sat Jan 26 18:30:48 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1358 2019/01/21 04:15:22 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1359 2019/01/26 18:30:48 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1576,7 +1576,44 @@ product ATI RADEON_HD8530M 0x6607 Radeon product ATI RADEON_HD8600 0x6610 Radeon HD 8600 product ATI RADEON_HD8570 0x6611 Radeon HD 8570 product ATI RADEON_HD8500 0x6613 Radeon HD 8500 +product ATI RADEON_HD6970 0x6718 Radeon HD 6970 +product ATI RADEON_HD6950 0x6719 Radeon HD 6950 +product ATI RADEON_HD6990_1 0x671c Radeon HD 6990 +product ATI RADEON_HD6990_2 0x671d Radeon HD 6990 +product ATI RADEON_HD6930 0x671f Radeon HD 6930 +product ATI RADEON_HD6970M 0x6720 Radeon HD 6970M +product ATI RADEON_HD6900M 0x6725 Radeon HD 6900M +product ATI RADEON_HD6870 0x6738 Radeon HD 6870 +product ATI RADEON_HD6850 0x6739 Radeon HD 6850 +product ATI RADEON_HD6790 0x673e Radeon HD 6790 +product ATI RADEON_HD6730M 0x6740 Radeon HD 6730M +product ATI RADEON_HD6600M 0x6741 Radeon HD 6600M +product ATI RADEON_HD6610M 0x6742 Radeon HD 6610M +product ATI RADEON_HD6650A 0x6750 Radeon HD 6650A +product ATI RADEON_HD7670A 0x6751 Radeon HD 7670A +product ATI RADEON_HD6670 0x6758 Radeon HD 6670 +product ATI RADEON_HD6570 0x6759 Radeon HD 6570 +product ATI RADEON_HD7570 0x675d Radeon HD 7570 +product ATI RADEON_HD6510 0x675f Radeon HD 6510 +product ATI RADEON_HD6400M 0x6760 Radeon HD 6400M +product ATI RADEON_HD6430M 0x6761 Radeon HD 6430M +product ATI RADEON_HD6400M_1 0x6764 Radeon HD 6400M +product ATI RADEON_HD6400M_2 0x6765 Radeon HD 6400M +product ATI RADEON_HD6450A 0x6770 Radeon HD 6450A +product ATI RADEON_HD8490 0x6771 Radeon HD 8490 +product ATI RADEON_HD7450A 0x6772 Radeon HD 7450A +product ATI RADEON_HD7470 0x6778 Radeon HD 7470 +product ATI RADEON_HD6450 0x6779 Radeon HD 6450 +product ATI RADEON_HD7450 0x677b Radeon HD 7450 +product ATI RADEON_HD7970 0x6798 Radeon HD 7970 +product ATI RADEON_HD7900 0x6799 Radeon HD 7900 +product ATI RADEON_HD7950 0x679a Radeon HD 7950 +product ATI RADEON_HD7990 0x679b Radeon HD 7990 +product ATI RADEON_HD7870XT 0x679e Radeon HD 7870 XT +product ATI RADEON_RX470 0x67df Radeon RX470 product ATI RADEON_RX460 0x67ef Radeon RX460 +product ATI RADEON_HD7970M 0x6800 Radeon HD 7970M +product ATI RADEON_HD8970M 0x6801 Radeon HD 8970M product ATI RADEON_HD8800M 0x682b Radeon HD 8800M product ATI RADEON_HD7730M 0x682f Radeon HD 7730M product ATI RADEON_HD7800M 0x6830 Radeon HD 7800M @@ -1661,6 +1698,7 @@ product ATI RADEON_HD5600_HDMI 0xaa60 Re product ATI RADEON_HD54XX_HDA 0xaa68 Radeon HD 54xx Audio product ATI RADEON_HD7700_HDA 0xaab0 Radeon HD 7700 HD Audio product ATI RADEON_RX460_HDA 0xaae0 Radeon RX460 HD Audio +product ATI RADEON_RX470_HDA 0xaaf0 Radeon RX470 HD Audio /* Auravision products */ product AURAVISION VXP524 0x01f7 VxP524 PCI Video Processor
CVS commit: src/bin/sleep
Module Name:src
Committed By: martin
Date: Sat Jan 26 18:14:22 UTC 2019
Modified Files:
src/bin/sleep: sleep.c
Log Message:
Explicitly cast time_t to match format string - should fix the build on
some 32bit architectures.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/sleep/sleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.27 src/bin/sleep/sleep.c:1.28
--- src/bin/sleep/sleep.c:1.27 Sat Jan 26 15:20:50 2019
+++ src/bin/sleep/sleep.c Sat Jan 26 18:14:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.27 2019/01/26 15:20:50 kre Exp $ */
+/* $NetBSD: sleep.c,v 1.28 2019/01/26 18:14:22 martin Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: sleep.c,v 1.27 2019/01/26 15:20:50 kre Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.28 2019/01/26 18:14:22 martin Exp $");
#endif
#endif /* not lint */
@@ -202,7 +202,8 @@ report(const time_t remain, const time_t
else if (remain < 2000)
warnx("Between %ld and %ld seconds left"
" out of the original %g%s",
- remain, remain + 1, (double)original, msg);
+ (long)remain, (long)remain + 1, (double)original,
+ msg);
else if ((original - remain) < 10 && (original-remain) < original/8)
warnx("Have waited only %d seconds of the original %g",
(int)(original - remain), (double)original);
CVS commit: src/tests/kernel
Module Name:src
Committed By: martin
Date: Sat Jan 26 16:44:30 UTC 2019
Modified Files:
src/tests/kernel: h_segv.c t_trapsignal.sh
Log Message:
Some arm CPUs do not implement traps on floating point exceptions.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/kernel/h_segv.c
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/t_trapsignal.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/h_segv.c
diff -u src/tests/kernel/h_segv.c:1.10 src/tests/kernel/h_segv.c:1.11
--- src/tests/kernel/h_segv.c:1.10 Mon Nov 12 05:02:00 2018
+++ src/tests/kernel/h_segv.c Sat Jan 26 16:44:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: h_segv.c,v 1.10 2018/11/12 05:02:00 riastradh Exp $ */
+/* $NetBSD: h_segv.c,v 1.11 2019/01/26 16:44:30 martin Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: h_segv.c,v 1.10 2018/11/12 05:02:00 riastradh Exp $");
+__RCSID("$NetBSD: h_segv.c,v 1.11 2019/01/26 16:44:30 martin Exp $");
#define __TEST_FENV
@@ -39,6 +39,7 @@ __RCSID("$NetBSD: h_segv.c,v 1.10 2018/1
#include
#include
+#include /* only need for ARM Cortex/Neon hack */
#include
#include
#include
@@ -50,6 +51,7 @@ static int flags;
#define F_HANDLE 2
#define F_MASK 4
#define F_IGNORE 8
+#define F_CHECK 16
static struct {
const char *n;
@@ -58,7 +60,8 @@ static struct {
{ "recurse", F_RECURSE },
{ "handle", F_HANDLE },
{ "mask", F_MASK },
- { "ignore", F_IGNORE }
+ { "ignore", F_IGNORE },
+ { "check", F_CHECK }
};
static int sig;
@@ -104,6 +107,23 @@ trigger_ill(void)
}
static void
+check_fpe(void)
+{
+#if (__arm__ && !__SOFTFP__) || __aarch64__
+ /*
+ * Some NEON fpus do not implement IEEE exception handling,
+ * skip these tests if running on them and compiled for
+ * hard float.
+ */
+ if (0 == fpsetmask(fpsetmask(FP_X_INV))) {
+ printf("FPU does not implement exception handling\n");
+ exit(EXIT_FAILURE);
+ }
+#endif
+ exit(EXIT_SUCCESS);
+}
+
+static void
trigger_fpe(void)
{
volatile double a = getpid();
@@ -185,7 +205,7 @@ usage(void)
const char *pname = getprogname();
fprintf(stderr, "Usage: %s segv|trap|ill|fpe|bus "
- "[recurse|mask|handle|ignore] ...\n", pname);
+ "[recurse|mask|handle|ignore|check] ...\n", pname);
exit(EXIT_FAILURE);
}
@@ -221,6 +241,13 @@ main(int argc, char *argv[])
if (flags == 0 || sig == 0)
usage();
+ if (flags & F_CHECK && sig != SIGFPE) {
+ fprintf(stderr, "can only check for fpe support\n");
+ return 1;
+ }
+ if (flags & F_CHECK)
+ check_fpe();
+
if (flags & F_HANDLE) {
struct sigaction sa;
Index: src/tests/kernel/t_trapsignal.sh
diff -u src/tests/kernel/t_trapsignal.sh:1.4 src/tests/kernel/t_trapsignal.sh:1.5
--- src/tests/kernel/t_trapsignal.sh:1.4 Sun May 27 17:04:45 2018
+++ src/tests/kernel/t_trapsignal.sh Sat Jan 26 16:44:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_trapsignal.sh,v 1.4 2018/05/27 17:04:45 kamil Exp $
+# $NetBSD: t_trapsignal.sh,v 1.5 2019/01/26 16:44:30 martin Exp $
#
# Copyright (c) 2017 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -172,6 +172,18 @@ trap_ignore_body()
# SIGFPE
+fpe_available()
+{
+ if ${HELPER} fpe check > msg.$$
+ then
+ rm -f msg.$$
+ else
+ msg=$( cat msg.$$ )
+ rm -f msg.$$
+ atf_skip "$msg"
+ fi
+}
+
atf_test_case fpe_simple
fpe_simple()
{
@@ -179,6 +191,7 @@ fpe_simple()
}
fpe_simple_body()
{
+ fpe_available
atf_check -s signal:8 -o "inline:" -e "inline:" \
${HELPER} fpe recurse
}
@@ -190,6 +203,7 @@ fpe_handle()
}
fpe_handle_body()
{
+ fpe_available
atf_check -s exit:0 -o "inline:" -e "inline:got 8\n" \
${HELPER} fpe handle
}
@@ -201,6 +215,7 @@ fpe_mask()
}
fpe_mask_body()
{
+ fpe_available
atf_check -s signal:8 -o "inline:" -e "inline:" \
${HELPER} fpe mask
}
@@ -212,6 +227,7 @@ fpe_handle_mask()
}
fpe_handle_mask_body()
{
+ fpe_available
atf_check -s signal:8 -o "inline:" -e "inline:" \
${HELPER} fpe mask handle
}
@@ -224,6 +240,7 @@ fpe_handle_recurse()
fpe_handle_recurse_body()
{
+ fpe_available
atf_check -s signal:8 -o "inline:" -e "inline:got 8\n" \
${HELPER} fpe handle recurse
}
@@ -236,6 +253,7 @@ fpe_ignore()
fpe_ignore_body()
{
+ fpe_available
atf_check -s signal:8 -o "inline:" -e "inline:" \
${HELPER} fpe ignore
}
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: martin
Date: Sat Jan 26 15:46:27 UTC 2019
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
aarch64 does not trap on unaligned acces
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.33 src/tests/lib/libc/gen/t_siginfo.c:1.34
--- src/tests/lib/libc/gen/t_siginfo.c:1.33 Wed Jan 23 17:36:01 2019
+++ src/tests/lib/libc/gen/t_siginfo.c Sat Jan 26 15:46:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.33 2019/01/23 17:36:01 martin Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.34 2019/01/26 15:46:27 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -464,8 +464,10 @@ ATF_TC_BODY(sigbus_adraln, tc)
atf_tc_skip("No SIGBUS signal for unaligned accesses");
#endif
- /* m68k (except sun2) never issue SIGBUS (PR lib/49653) */
- if (strcmp(MACHINE_ARCH, "m68k") == 0)
+ /* m68k (except sun2) never issue SIGBUS (PR lib/49653),
+ * same for armv8 or newer */
+ if (strcmp(MACHINE_ARCH, "m68k") == 0 ||
+ strcmp(MACHINE_ARCH, "aarch64") == 0)
atf_tc_skip("No SIGBUS signal for unaligned accesses");
sa.sa_flags = SA_SIGINFO;
CVS commit: src/sys/dev/nvmm
Module Name:src
Committed By: maxv
Date: Sat Jan 26 15:25:51 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.c nvmm_internal.h
Log Message:
Optimize: keep a per-VCPU buffer for the state, and copy in and out
directly on it. The VCPUs are protected by mutexes, so nothing to worry
about.
This saves two kmem_allocs in {get,set}state.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nvmm/nvmm_internal.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/nvmm/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.5 src/sys/dev/nvmm/nvmm.c:1.6
--- src/sys/dev/nvmm/nvmm.c:1.5 Sun Jan 6 16:10:51 2019
+++ src/sys/dev/nvmm/nvmm.c Sat Jan 26 15:25:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.5 2019/01/06 16:10:51 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.6 2019/01/26 15:25:51 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.5 2019/01/06 16:10:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.6 2019/01/26 15:25:51 maxv Exp $");
#include
#include
@@ -142,6 +142,7 @@ nvmm_vcpu_alloc(struct nvmm_machine *mac
vcpu->present = true;
vcpu->cpuid = i;
+ vcpu->state = kmem_zalloc(nvmm_impl->state_size, KM_SLEEP);
*ret = vcpu;
return 0;
}
@@ -154,6 +155,7 @@ nvmm_vcpu_free(struct nvmm_machine *mach
{
KASSERT(mutex_owned(>lock));
vcpu->present = false;
+ kmem_free(vcpu->state, nvmm_impl->state_size);
vcpu->hcpu_last = -1;
}
@@ -404,33 +406,27 @@ nvmm_vcpu_setstate(struct nvmm_ioc_vcpu_
{
struct nvmm_machine *mach;
struct nvmm_cpu *vcpu;
- void *data;
int error;
- data = kmem_alloc(nvmm_impl->state_size, KM_SLEEP);
-
error = nvmm_machine_get(args->machid, , false);
- if (error) {
- kmem_free(data, nvmm_impl->state_size);
+ if (error)
return error;
- }
error = nvmm_vcpu_get(mach, args->cpuid, );
if (error)
goto out;
- error = copyin(args->state, data, nvmm_impl->state_size);
+ error = copyin(args->state, vcpu->state, nvmm_impl->state_size);
if (error) {
nvmm_vcpu_put(vcpu);
goto out;
}
- (*nvmm_impl->vcpu_setstate)(vcpu, data, args->flags);
+ (*nvmm_impl->vcpu_setstate)(vcpu, vcpu->state, args->flags);
nvmm_vcpu_put(vcpu);
out:
nvmm_machine_put(mach);
- kmem_free(data, nvmm_impl->state_size);
return error;
}
@@ -439,28 +435,22 @@ nvmm_vcpu_getstate(struct nvmm_ioc_vcpu_
{
struct nvmm_machine *mach;
struct nvmm_cpu *vcpu;
- void *data;
int error;
- data = kmem_alloc(nvmm_impl->state_size, KM_SLEEP);
-
error = nvmm_machine_get(args->machid, , false);
- if (error) {
- kmem_free(data, nvmm_impl->state_size);
+ if (error)
return error;
- }
error = nvmm_vcpu_get(mach, args->cpuid, );
if (error)
goto out;
- (*nvmm_impl->vcpu_getstate)(vcpu, data, args->flags);
+ (*nvmm_impl->vcpu_getstate)(vcpu, vcpu->state, args->flags);
nvmm_vcpu_put(vcpu);
- error = copyout(data, args->state, nvmm_impl->state_size);
+ error = copyout(vcpu->state, args->state, nvmm_impl->state_size);
out:
nvmm_machine_put(mach);
- kmem_free(data, nvmm_impl->state_size);
return error;
}
Index: src/sys/dev/nvmm/nvmm_internal.h
diff -u src/sys/dev/nvmm/nvmm_internal.h:1.2 src/sys/dev/nvmm/nvmm_internal.h:1.3
--- src/sys/dev/nvmm/nvmm_internal.h:1.2 Sat Dec 15 13:39:43 2018
+++ src/sys/dev/nvmm/nvmm_internal.h Sat Jan 26 15:25:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_internal.h,v 1.2 2018/12/15 13:39:43 maxv Exp $ */
+/* $NetBSD: nvmm_internal.h,v 1.3 2019/01/26 15:25:51 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -43,6 +43,9 @@ struct nvmm_cpu {
nvmm_cpuid_t cpuid;
kmutex_t lock;
+ /* State buffer. */
+ void *state;
+
/* Last host CPU on which the VCPU ran. */
int hcpu_last;
CVS commit: src/usr.bin/printf
Module Name:src
Committed By: kre
Date: Sat Jan 26 15:22:54 UTC 2019
Modified Files:
src/usr.bin/printf: printf.c
Log Message:
Always convert input numbers (from the command line) in the C
locale, not as set in the environment. Conforms with POSIX spec.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/printf/printf.c
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/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.46 src/usr.bin/printf/printf.c:1.47
--- src/usr.bin/printf/printf.c:1.46 Mon Sep 10 14:42:29 2018
+++ src/usr.bin/printf/printf.c Sat Jan 26 15:22:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.46 2018/09/10 14:42:29 kre Exp $ */
+/* $NetBSD: printf.c,v 1.47 2019/01/26 15:22:54 kre Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.46 2018/09/10 14:42:29 kre Exp $");
+__RCSID("$NetBSD: printf.c,v 1.47 2019/01/26 15:22:54 kre Exp $");
#endif
#endif /* not lint */
@@ -682,7 +682,7 @@ getdouble(void)
return (double) *((*gargv++)+1);
errno = 0;
- val = strtod(*gargv, );
+ val = strtod_l(*gargv, , LC_C_LOCALE);
check_conversion(*gargv++, ep);
return val;
}
CVS commit: src/bin/sleep
Module Name:src
Committed By: kre
Date: Sat Jan 26 15:20:50 UTC 2019
Modified Files:
src/bin/sleep: sleep.1 sleep.c
Log Message:
While cute, the previous version is not really safe.
After all, a system might want to sleep for several
thousand years on a spaceship headed to a distant
solar system...
So, remove the pause() code, deal with limits on the
range (it is just an int) that can be passed to sleep()
by looping, and do a much better job of checking for
out of range input values.
With this change sleep(1) should work for durations
up to something more than 250 billion years. It
fails (at startup, with an error) if the requested
duration is beyond what can be handled.
Here no changes at all related to locales and arg
parsing.Still for another day.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/bin/sleep/sleep.1
cvs rdiff -u -r1.26 -r1.27 src/bin/sleep/sleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sleep/sleep.1
diff -u src/bin/sleep/sleep.1:1.25 src/bin/sleep/sleep.1:1.26
--- src/bin/sleep/sleep.1:1.25 Sat Jan 26 15:19:08 2019
+++ src/bin/sleep/sleep.1 Sat Jan 26 15:20:50 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: sleep.1,v 1.25 2019/01/26 15:19:08 kre Exp $
+.\" $NetBSD: sleep.1,v 1.26 2019/01/26 15:20:50 kre Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -61,15 +61,6 @@ Permitting non-integral delays is a non-
and its use will decrease the probability that
a shell script will execute properly on another system.
.Pp
-If the request is for more than a little over 135 years
-.Nm
-will pause forever.
-If the computer is still running when the
-.Nm
-should have terminated,
-.Nm
-will need to be killed by outside intervention.
-.Pp
When the
.Dv SIGINFO
signal is received, an estimate of the number of seconds remaining to
@@ -158,6 +149,21 @@ The
command is expected to be
.St -p1003.2
compatible.
+.Sh BUGS
+This
+.Nm
+command cannot handle requests for durations
+much longer than about 250 billion years.
+Any such attempt will result in an error,
+and immediate termination.
+It is suggested that when there is a need
+for sleeps exceeding this period, the
+.Nm
+command be executed in a loop, with each
+individual
+.Nm
+invocation limited to 200 billion years
+approximately.
.Sh HISTORY
A
.Nm
@@ -167,3 +173,5 @@ Processing fractional seconds, and proce
.Ic seconds
argument respecting the current locale, was added in
.Nx 1.3 .
+The ability to sleep for extended periods appeared in
+.Nx 9 .
Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.26 src/bin/sleep/sleep.c:1.27
--- src/bin/sleep/sleep.c:1.26 Sat Jan 26 15:19:08 2019
+++ src/bin/sleep/sleep.c Sat Jan 26 15:20:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.26 2019/01/26 15:19:08 kre Exp $ */
+/* $NetBSD: sleep.c,v 1.27 2019/01/26 15:20:50 kre Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: sleep.c,v 1.26 2019/01/26 15:19:08 kre Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.27 2019/01/26 15:20:50 kre Exp $");
#endif
#endif /* not lint */
@@ -109,6 +109,8 @@ main(int argc, char *argv[])
* into the floating point conversion path if the input
* is hex (the 'x' in 0xA is not a digit). Then if
* strtod() handles hex (on NetBSD it does) so will we.
+ * That path is also taken for scientific notation (1.2e+3)
+ * and when the input is simply nonsense.
*/
fracflag = 0;
arg = *argv;
@@ -132,19 +134,21 @@ main(int argc, char *argv[])
val = strtod_l(arg, , LC_C_LOCALE);
if (val < 0 || temp == arg || *temp != '\0')
usage();
+
ival = floor(val);
fval = (10 * (val-ival));
- if (ival >= (double)UINT_MAX)
- ntime.tv_sec = (double)UINT_MAX;
- else
- ntime.tv_sec = ival;
+ ntime.tv_sec = ival;
+ if ((double)ntime.tv_sec != ival)
+ errx(1, "requested delay (%s) out of range", arg);
ntime.tv_nsec = fval;
+
if (ntime.tv_sec == 0 && ntime.tv_nsec == 0)
return EXIT_SUCCESS; /* was 0.0 or underflowed */
} else {
ntime.tv_sec = strtol(arg, , 10);
if (ntime.tv_sec < 0 || temp == arg || *temp != '\0')
usage();
+
if (ntime.tv_sec == 0)
return EXIT_SUCCESS;
ntime.tv_nsec = 0;
@@ -166,28 +170,21 @@ main(int argc, char *argv[])
} else
err(EXIT_FAILURE, "nanosleep failed");
}
- } else {
- delay = (unsigned long)ntime.tv_sec;
+ } else while (ntime.tv_sec > 0) {
+ delay = (unsigned int)ntime.tv_sec;
- if ((time_t)delay != ntime.tv_sec ||
- delay > UINT_MAX - 86400) {
- for (;;) {
-pause();
-if (report_requested) {
- warnx("Waiting for the end of time");
- report_requested = 0;
-} else
- break;
- }
- } else {
- while ((delay = sleep(delay)) != 0) {
-
CVS commit: src/bin/sleep
Module Name:src
Committed By: kre
Date: Sat Jan 26 15:19:08 UTC 2019
Modified Files:
src/bin/sleep: sleep.1 sleep.c
Log Message:
Adjust the way the arg string is parsed in the "not entirely
integer" case, so we avoid adjusting the locale of sleep,
and generally be more reliable and simpler.
In addition, deal with weirdness in nanosleep() when the
interval gets long, by avoiding using it. In this version
when the sleep interval < 1 seconds, we use nanosleep()
as before, for delays longer than that we use sleep() instead,
and ignore any fractional seconds.
We avoid overflow problems here by not bothering to sleep
at all for delays longer than 135 years (approx) and simply
pause() instead. That sleep never terminates in such a
case is unlikely to ever be observed.
This commit makes no decision on the question of whether
the arg should be interpreted in the locale of the user,
or always in the C locale. That is for another day.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/sleep/sleep.1
cvs rdiff -u -r1.25 -r1.26 src/bin/sleep/sleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sleep/sleep.1
diff -u src/bin/sleep/sleep.1:1.24 src/bin/sleep/sleep.1:1.25
--- src/bin/sleep/sleep.1:1.24 Mon Jul 3 21:33:24 2017
+++ src/bin/sleep/sleep.1 Sat Jan 26 15:19:08 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: sleep.1,v 1.24 2017/07/03 21:33:24 wiz Exp $
+.\" $NetBSD: sleep.1,v 1.25 2019/01/26 15:19:08 kre Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)sleep.1 8.3 (Berkeley) 4/18/94
.\"
-.Dd August 12, 2016
+.Dd January 26, 2019
.Dt SLEEP 1
.Os
.Sh NAME
@@ -44,9 +44,9 @@
.Sh DESCRIPTION
The
.Nm
-utility
-suspends execution for a minimum of
-.Ar seconds .
+utility suspends execution for a minimum of
+.Ar seconds
+seconds, then exits.
It is usually used to schedule the execution of other commands (see
.Sx EXAMPLES
below).
@@ -55,12 +55,24 @@ Note: The
.Nx
.Nm
command will accept and honor a non-integer number of specified seconds.
-This is a non-portable extension, and its use will nearly guarantee that
-a shell script will not execute properly on another system.
+Note however, that if the request is for much more than 2.5 hours,
+any fractional seconds will be ignored.
+Permitting non-integral delays is a non-portable extension,
+and its use will decrease the probability that
+a shell script will execute properly on another system.
+.Pp
+If the request is for more than a little over 135 years
+.Nm
+will pause forever.
+If the computer is still running when the
+.Nm
+should have terminated,
+.Nm
+will need to be killed by outside intervention.
.Pp
When the
.Dv SIGINFO
-signal is received, the estimate of the amount of seconds left to
+signal is received, an estimate of the number of seconds remaining to
sleep is printed on the standard output.
.Sh EXIT STATUS
The
@@ -77,15 +89,16 @@ An error occurred.
.Sh EXAMPLES
To schedule the execution of a command for 1800 seconds later:
.Pp
-.Dl (sleep 1800; sh command_file >& errors)&
+.Dl (sleep 1800; sh command_file >errors 2>&1)&
.Pp
This incantation would wait half an hour before
-running the script command_file.
+running the script
+.Dq command_file .
(See the
.Xr at 1
utility.)
.Pp
-To reiteratively run a command (with
+To repeatedly run a command (using
.Xr csh 1 ) :
.Pp
.Bd -literal -offset indent -compact
@@ -107,12 +120,36 @@ running is taking longer than expected t
files, and it would be nice to have
another program start processing the files created by the first
program as soon as it is finished (when zzz.rawdata is created).
-The script checks every five minutes for the file zzz.rawdata,
-when the file is found, then another portion processing
+The script checks every five minutes for the file zzz.rawdata.
+When the file is found, processing the generated files (*.rawdata)
is done courteously by sleeping for 70 seconds in between each
awk job.
+.Pp
+To wait until a particular time, the following,
+with some error checking added, might be used (using
+.Xr sh 1
+on
+.Nx ) :
+.Bd -literal -offset indent
+END=$(( $( date -d "$1" +%s ) - START_TIME ))
+while [ "${SECONDS}" -lt "${END}" ]
+do
+ sleep "$((END - SECONDS))"
+done
+.Ed
+.Pp
+where the argument
+.Sq \&$1
+specifies the desired date and time in any format the
+.Fl d
+option to the
+.Xr date 1
+command accepts.
.Sh SEE ALSO
.Xr at 1 ,
+.Xr csh 1 ,
+.Xr date 1 ,
+.Xr sh 1 ,
.Xr nanosleep 2 ,
.Xr sleep 3
.Sh STANDARDS
@@ -126,3 +163,7 @@ A
.Nm
utility appeared in
.At v4 .
+Processing fractional seconds, and processing the
+.Ic seconds
+argument respecting the current locale, was added in
+.Nx 1.3 .
Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.25 src/bin/sleep/sleep.c:1.26
--- src/bin/sleep/sleep.c:1.25 Sat
CVS commit: src/sys/dev/nvmm
Module Name:src
Committed By: maxv
Date: Sat Jan 26 15:12:20 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.h
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Remove nvmm_exit_memory.npc, useless.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nvmm/nvmm.h
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/nvmm/x86/nvmm_x86_svm.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/nvmm/nvmm.h
diff -u src/sys/dev/nvmm/nvmm.h:1.3 src/sys/dev/nvmm/nvmm.h:1.4
--- src/sys/dev/nvmm/nvmm.h:1.3 Thu Jan 24 13:05:59 2019
+++ src/sys/dev/nvmm/nvmm.h Sat Jan 26 15:12:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.h,v 1.3 2019/01/24 13:05:59 maxv Exp $ */
+/* $NetBSD: nvmm.h,v 1.4 2019/01/26 15:12:20 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -75,7 +75,6 @@ struct nvmm_exit_memory {
gpaddr_t gpa;
uint8_t inst_len;
uint8_t inst_bytes[15];
- uint64_t npc;
};
enum nvmm_exit_io_type {
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.17 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.18
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.17 Thu Jan 24 13:05:59 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Sat Jan 26 15:12:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.17 2019/01/24 13:05:59 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.18 2019/01/26 15:12:20 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.17 2019/01/24 13:05:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.18 2019/01/26 15:12:20 maxv Exp $");
#include
#include
@@ -1051,7 +1051,6 @@ svm_exit_npf(struct nvmm_machine *mach,
exit->u.mem.inst_len = cpudata->vmcb->ctrl.inst_len;
memcpy(exit->u.mem.inst_bytes, cpudata->vmcb->ctrl.inst_bytes,
sizeof(exit->u.mem.inst_bytes));
- exit->u.mem.npc = cpudata->vmcb->ctrl.nrip;
} else {
exit->reason = NVMM_EXIT_NONE;
}
CVS commit: src/lib/libnvmm
Module Name:src
Committed By: maxv
Date: Sat Jan 26 14:44:54 UTC 2019
Modified Files:
src/lib/libnvmm: libnvmm_x86.c
Log Message:
Ah, fix bug: when the opcode has an immediate, we fill the src with a
register storage, but then we overwrite it without zeroing out the highest
bits of the resulting immediate (which may contain garbage from the union).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libnvmm/libnvmm_x86.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnvmm/libnvmm_x86.c
diff -u src/lib/libnvmm/libnvmm_x86.c:1.15 src/lib/libnvmm/libnvmm_x86.c:1.16
--- src/lib/libnvmm/libnvmm_x86.c:1.15 Sun Jan 13 10:43:22 2019
+++ src/lib/libnvmm/libnvmm_x86.c Sat Jan 26 14:44:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libnvmm_x86.c,v 1.15 2019/01/13 10:43:22 maxv Exp $ */
+/* $NetBSD: libnvmm_x86.c,v 1.16 2019/01/26 14:44:54 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -2071,12 +2071,14 @@ node_regmodrm(struct x86_decode_fsm *fsm
instr->emul = group11[instr->regmodrm.reg].emul;
}
- reg = get_register_reg(instr, opcode);
- if (reg == NULL) {
- return -1;
+ if (!opcode->immediate) {
+ reg = get_register_reg(instr, opcode);
+ if (reg == NULL) {
+ return -1;
+ }
+ strg->type = STORE_REG;
+ strg->u.reg = reg;
}
- strg->type = STORE_REG;
- strg->u.reg = reg;
if (has_sib(instr)) {
/* Overwrites RM */
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: thorpej
Date: Sat Jan 26 14:43:46 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: gic_fdt.c gicv3_fdt.c
Log Message:
Define constants for representing the standard interrupt types
({pos,neg,double}-edge, {high,low}-level) from the FDT "interrupts"
bindings. Use these defined constants rather than magic numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/fdt/gic_fdt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/fdt/gicv3_fdt.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/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.15 src/sys/arch/arm/fdt/gic_fdt.c:1.16
--- src/sys/arch/arm/fdt/gic_fdt.c:1.15 Mon Nov 12 12:41:03 2018
+++ src/sys/arch/arm/fdt/gic_fdt.c Sat Jan 26 14:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.15 2018/11/12 12:41:03 jmcneill Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "pci.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.15 2018/11/12 12:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $");
#include
#include
@@ -249,7 +249,8 @@ gic_fdt_establish(device_t dev, u_int *s
const u_int intr = be32toh(specifier[1]);
const u_int irq = type == 0 ? IRQ_SPI(intr) : IRQ_PPI(intr);
const u_int trig = be32toh(specifier[2]) & 0xf;
- const u_int level = (trig & 0x3) ? IST_EDGE : IST_LEVEL;
+ const u_int level = (trig & FDT_INTR_TYPE_DOUBLE_EDGE)
+ ? IST_EDGE : IST_LEVEL;
const u_int mpsafe = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
Index: src/sys/arch/arm/fdt/gicv3_fdt.c
diff -u src/sys/arch/arm/fdt/gicv3_fdt.c:1.6 src/sys/arch/arm/fdt/gicv3_fdt.c:1.7
--- src/sys/arch/arm/fdt/gicv3_fdt.c:1.6 Sat Nov 24 22:18:57 2018
+++ src/sys/arch/arm/fdt/gicv3_fdt.c Sat Jan 26 14:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_fdt.c,v 1.6 2018/11/24 22:18:57 jakllsch Exp $ */
+/* $NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.6 2018/11/24 22:18:57 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $");
#include
#include
@@ -280,7 +280,8 @@ gicv3_fdt_establish(device_t dev, u_int
const u_int intr = be32toh(specifier[1]);
const u_int irq = type == 0 ? IRQ_SPI(intr) : IRQ_PPI(intr);
const u_int trig = be32toh(specifier[2]) & 0xf;
- const u_int level = (trig & 0x3) ? IST_EDGE : IST_LEVEL;
+ const u_int level = (trig & FDT_INTR_TYPE_DOUBLE_EDGE)
+ ? IST_EDGE : IST_LEVEL;
const u_int mpsafe = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
CVS commit: src/sys
Module Name:src
Committed By: thorpej
Date: Sat Jan 26 14:38:30 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_gpio.c
src/sys/arch/arm/nvidia: tegra_lic.c
src/sys/arch/arm/sunxi: sunxi_gpio.c
src/sys/dev/fdt: fdtvar.h
Log Message:
Define constants for representing the standard interrupt types
({pos,neg,double}-edge, {high,low}-level) from the FDT "interrupts"
bindings. Use these defined constants rather than magic numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm2835_gpio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_lic.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/fdt/fdtvar.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/arch/arm/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.8 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.9
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.8 Fri Sep 28 13:24:02 2018
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Sat Jan 26 14:38:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.9 2019/01/26 14:38:29 thorpej Exp $ */
/*-
* Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.9 2019/01/26 14:38:29 thorpej Exp $");
/*
* Driver for BCM2835 GPIO
@@ -567,19 +567,19 @@ bcmgpio_fdt_intr_establish(device_t dev,
const u_int type = be32toh(specifier[1]) & 0xf;
switch (type) {
- case 0x1:
+ case FDT_INTR_TYPE_POS_EDGE:
eint_flags |= BCMGPIO_INTR_POS_EDGE;
break;
- case 0x2:
+ case FDT_INTR_TYPE_NEG_EDGE:
eint_flags |= BCMGPIO_INTR_NEG_EDGE;
break;
- case 0x3:
+ case FDT_INTR_TYPE_DOUBLE_EDGE:
eint_flags |= BCMGPIO_INTR_POS_EDGE | BCMGPIO_INTR_NEG_EDGE;
break;
- case 0x4:
+ case FDT_INTR_TYPE_HIGH_LEVEL:
eint_flags |= BCMGPIO_INTR_HIGH_LEVEL;
break;
- case 0x8:
+ case FDT_INTR_TYPE_LOW_LEVEL:
eint_flags |= BCMGPIO_INTR_LOW_LEVEL;
break;
default:
Index: src/sys/arch/arm/nvidia/tegra_lic.c
diff -u src/sys/arch/arm/nvidia/tegra_lic.c:1.5 src/sys/arch/arm/nvidia/tegra_lic.c:1.6
--- src/sys/arch/arm/nvidia/tegra_lic.c:1.5 Fri May 26 20:08:02 2017
+++ src/sys/arch/arm/nvidia/tegra_lic.c Sat Jan 26 14:38:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_lic.c,v 1.5 2017/05/26 20:08:02 jmcneill Exp $ */
+/* $NetBSD: tegra_lic.c,v 1.6 2019/01/26 14:38:29 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_lic.c,v 1.5 2017/05/26 20:08:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_lic.c,v 1.6 2019/01/26 14:38:29 thorpej Exp $");
#include
#include
@@ -142,7 +142,8 @@ tegra_lic_establish(device_t dev, u_int
const u_int intr = be32toh(specifier[1]);
const u_int irq = type == 0 ? IRQ_SPI(intr) : IRQ_PPI(intr);
const u_int trig = be32toh(specifier[2]) & 0xf;
- const u_int level = (trig & 0x3) ? IST_EDGE : IST_LEVEL;
+ const u_int level = (trig & FDT_INTR_TYPE_DOUBLE_EDGE)
+ ? IST_EDGE : IST_LEVEL;
return intr_establish(irq, ipl, level | iflags, func, arg);
}
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.22 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.23
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.22 Wed Jan 23 04:21:54 2019
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Sat Jan 26 14:38:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.22 2019/01/23 04:21:54 thorpej Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.23 2019/01/26 14:38:30 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.22 2019/01/23 04:21:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.23 2019/01/26 14:38:30 thorpej Exp $");
#include
#include
@@ -458,19 +458,19 @@ sunxi_gpio_establish(device_t dev, u_int
const u_int type = be32toh(specifier[2]) & 0xf;
switch (type) {
- case 0x1:
+ case FDT_INTR_TYPE_POS_EDGE:
mode = SUNXI_GPIO_INT_MODE_POS_EDGE;
break;
- case 0x2:
+ case FDT_INTR_TYPE_NEG_EDGE:
mode = SUNXI_GPIO_INT_MODE_NEG_EDGE;
break;
- case 0x3:
+ case FDT_INTR_TYPE_DOUBLE_EDGE:
mode = SUNXI_GPIO_INT_MODE_DOUBLE_EDGE;
break;
- case 0x4:
+ case FDT_INTR_TYPE_HIGH_LEVEL:
mode = SUNXI_GPIO_INT_MODE_HIGH_LEVEL;
break;
- case 0x8:
+ case FDT_INTR_TYPE_LOW_LEVEL:
mode = SUNXI_GPIO_INT_MODE_LOW_LEVEL;
break;
default:
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.46 src/sys/dev/fdt/fdtvar.h:1.47
--- src/sys/dev/fdt/fdtvar.h:1.46 Wed Jan 23 04:21:55 2019
+++ src/sys/dev/fdt/fdtvar.h Sat Jan 26 14:38:30 2019
@@ -1,4
