CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Tue Oct 2 01:43:53 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/aarch64/conf [pgoyette-compat]: files.aarch64
src/sys/arch/sparc/fpu [pgoyette-compat]: fpu.c
src/sys/compat/sunos [pgoyette-compat]: sunos_mod.c
src/sys/compat/sunos32 [pgoyette-compat]: sunos32_mod.c
src/sys/kern [pgoyette-compat]: compat_stub.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Log Message:
Use a hook callback to allow sparc fpu code to determine if a process
is running under sunos emulation (in which case, fpu cleanup uses a
different set of fpu_codes[]).
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/sys/arch/aarch64/aarch64/netbsd32_machdep.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/aarch64/conf/files.aarch64
cvs rdiff -u -r1.27 -r1.27.46.1 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/compat/sunos/sunos_mod.c
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/compat/sunos32/sunos32_mod.c
cvs rdiff -u -r1.1.2.25 -r1.1.2.26 src/sys/kern/compat_stub.c
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/sys/sys/compat_stub.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/aarch64/aarch64/netbsd32_machdep.c
diff -u src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.3 src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.4
--- src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.3 Mon Oct 1 21:19:16 2018
+++ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c Tue Oct 2 01:43:53 2018
@@ -29,9 +29,9 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.1.2.3 2018/10/01 21:19:16 pgoyette Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.1.2.4 2018/10/02 01:43:53 pgoyette Exp $");
-#if defined(_KERNEL_OPT
+#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
#endif
Index: src/sys/arch/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.2.2.2 src/sys/arch/aarch64/conf/files.aarch64:1.2.2.3
--- src/sys/arch/aarch64/conf/files.aarch64:1.2.2.2 Sun Sep 30 01:45:35 2018
+++ src/sys/arch/aarch64/conf/files.aarch64 Tue Oct 2 01:43:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.aarch64,v 1.2.2.2 2018/09/30 01:45:35 pgoyette Exp $
+# $NetBSD: files.aarch64,v 1.2.2.3 2018/10/02 01:43:53 pgoyette Exp $
defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK
defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -118,8 +118,8 @@ include "compat/netbsd32/files.netbsd32"
file arch/aarch64/aarch64/netbsd32_machdep.c compat_netbsd32
#file arch/aarch64/aarch32/aarch32_oabi_machdep.c compat_aarch32_oabi
#file arch/aarch64/aarch32/aarch32_eabi_machdep.c compat_aarch32_eabi
-#file arch/aarch64/aarch32/compat_13_machdep.c compat_13 & compat_netbsd32
-#file arch/aarch64/aarch32/compat_16_machdep.c compat_16 & compat_netbsd32
+file arch/aarch64/aarch32/netbsd32_machdep_13.c compat_13 & compat_netbsd32
+file arch/aarch64/aarch32/netbsd32_machdep_16.c compat_16 & compat_netbsd32
# Linux binary compatibility (COMPAT_LINUX)
#include "compat/ossaudio/files.ossaudio"
Index: src/sys/arch/sparc/fpu/fpu.c
diff -u src/sys/arch/sparc/fpu/fpu.c:1.27 src/sys/arch/sparc/fpu/fpu.c:1.27.46.1
--- src/sys/arch/sparc/fpu/fpu.c:1.27 Sun Feb 12 16:34:10 2012
+++ src/sys/arch/sparc/fpu/fpu.c Tue Oct 2 01:43:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.27 2012/02/12 16:34:10 matt Exp $ */
+/* $NetBSD: fpu.c,v 1.27.46.1 2018/10/02 01:43:53 pgoyette Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27 2012/02/12 16:34:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27.46.1 2018/10/02 01:43:53 pgoyette Exp $");
#include
#include
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.27
#include
#include
#include
+#include
#include
#include
@@ -108,7 +109,6 @@ static u_char fpu_codes_native[] = {
X8(FPE_FLTOVF),
X16(FPE_FLTINV)
};
-#if defined(COMPAT_SUNOS)
static u_char fpu_codes_sunos[] = {
X1(FPE_FLTINEX_TRAP),
X2(FPE_FLTDIV_TRAP),
@@ -116,11 +116,17 @@ static u_char fpu_codes_sunos[] = {
X8(FPE_FLTOVF_TRAP),
X16(FPE_FLTOPERR_TRAP)
};
-extern struct emul emul_sunos;
-#endif /* SUNOS_COMPAT */
+
/* Note: SVR4(Solaris) FPE_* codes happen to be compatible with ours */
/*
+ * HOOK for checking if the lwp's emul matches sunos
+ */
+MODULE_CALL_HOOK_DECL(get_emul_sunos_hook, f, (const struct emul **emul));
+MODULE_CALL_HOOK(get_emul_sunos_hook, f, (const struct emul ** emul), (emul),
+enosys());
+
+/*
* The FPU gave us an exception. Clean up the mess. Note that the
* fp queue can only have FPops in it, never load/store FP registers
* nor FBfcc instructions. Experiments with `crashme' prove that
@@ -142,12 +148,13 @@ fpu_cleanup(
struct fpemu fe;
u_char *fpu_codes;
int
CVS commit: [pgoyette-compat] src/sys/compat/sunos32
Module Name:src Committed By: pgoyette Date: Tue Oct 2 00:00:09 UTC 2018 Modified Files: src/sys/compat/sunos32 [pgoyette-compat]: files.sunos32 Log Message: Revert most of previous. Leave the original dependencies, but still remove the duplicate attribute definition to make config(1) happier. To generate a diff of this commit: cvs rdiff -u -r1.3.18.2 -r1.3.18.3 src/sys/compat/sunos32/files.sunos32 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/sunos32/files.sunos32 diff -u src/sys/compat/sunos32/files.sunos32:1.3.18.2 src/sys/compat/sunos32/files.sunos32:1.3.18.3 --- src/sys/compat/sunos32/files.sunos32:1.3.18.2 Sat Sep 22 03:31:40 2018 +++ src/sys/compat/sunos32/files.sunos32 Tue Oct 2 00:00:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunos32,v 1.3.18.2 2018/09/22 03:31:40 pgoyette Exp $ +# $NetBSD: files.sunos32,v 1.3.18.3 2018/10/02 00:00:09 pgoyette Exp $ # # Config file description for machine-independent SunOS compat code for # 64-bit kernel. Included by ports that need it. @@ -7,12 +7,11 @@ # own file lists. # XXX compat_sunos32 -define compat_sunos32 : compat_netbsd, compat_netbsd32, exec_aout -file compat/sunos32/sunos32_exec.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_exec_aout.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_misc.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_ioctl.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_sysent.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_mod.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_syscalls.c syscall_debug & - compat_sunos32 & compat_netbsd32 +#define compat_sunos +file compat/sunos32/sunos32_exec.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_exec_aout.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_misc.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_ioctl.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_sysent.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_mod.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_syscalls.c syscall_debug & compat_sunos & compat_netbsd32
CVS commit: [pgoyette-compat] src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: pgoyette
Date: Mon Oct 1 21:19:16 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64 [pgoyette-compat]: netbsd32_machdep.c
Added Files:
src/sys/arch/aarch64/aarch64 [pgoyette-compat]: netbsd32_machdep_13.c
netbsd32_machdep_16.c
Log Message:
Implement dummy netbsd32_compat_{13,16} routines. aarch64 doesn't have
compat going that far back, but the build infrastructure expects to see
these sources and *_{init,fini} symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/arch/aarch64/aarch64/netbsd32_machdep.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c \
src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.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/netbsd32_machdep.c
diff -u src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.2 src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.3
--- src/sys/arch/aarch64/aarch64/netbsd32_machdep.c:1.1.2.2 Sat Apr 7 04:12:10 2018
+++ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c Mon Oct 1 21:19:16 2018
@@ -29,9 +29,11 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.1.2.2 2018/04/07 04:12:10 pgoyette Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.1.2.3 2018/10/01 21:19:16 pgoyette Exp $");
+#if defined(_KERNEL_OPT
#include "opt_compat_netbsd.h"
+#endif
#include
#include
@@ -121,3 +123,16 @@ netbsd32_vm_default_addr(struct proc *p,
return VM_DEFAULT_ADDRESS_BOTTOMUP(base, sz);
}
+void
+netbsd32_machdep_md_init(void)
+{
+
+ /* nothing to do */
+}
+
+void
+netbsd32_machdep_md_fini(void)
+{
+
+ /* nothing to do */
+}
Added files:
Index: src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c
diff -u /dev/null src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c:1.1.2.1
--- /dev/null Mon Oct 1 21:19:16 2018
+++ src/sys/arch/aarch64/aarch64/netbsd32_machdep_13.c Mon Oct 1 21:19:16 2018
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Goyette
+ *
+ * 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.
+ */
+
+#include
+
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_13.c,v 1.1.2.1 2018/10/01 21:19:16 pgoyette Exp $");
+
+#if defined (_KERNEL_OPT)
+#include "opt_compat_netbsd.h"
+#endif
+
+void
+netbsd32_machdep_md_13_init(void)
+{
+
+ /* nothing to do */
+}
+
+void
+netbsd32_machdep_md_13_fini(void)
+{
+
+ /* nothing to do */
+}
Index: src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.c
diff -u /dev/null src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.c:1.1.2.1
--- /dev/null Mon Oct 1 21:19:16 2018
+++ src/sys/arch/aarch64/aarch64/netbsd32_machdep_16.c Mon Oct 1 21:19:16 2018
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Goyette
+ *
+ * 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
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Mon Oct 1 19:45:01 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
Comment out printing L2CTLR_EL1 as it is implementation specific.
OK ryo
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/aarch64/locore.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/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.25 src/sys/arch/aarch64/aarch64/locore.S:1.26
--- src/sys/arch/aarch64/aarch64/locore.S:1.25 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/aarch64/aarch64/locore.S Mon Oct 1 19:45:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.25 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: locore.S,v 1.26 2018/10/01 19:45:00 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -35,7 +35,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.25 2018/09/10 11:05:12 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.26 2018/10/01 19:45:00 skrll Exp $")
/* #define DEBUG_LOCORE */
/* #define DEBUG_MMU */
@@ -124,9 +124,11 @@ ENTRY_NP(aarch64_start)
mrs x0, mpidr_el1
bl print_x0
+#if 0
PRINT("L2CTLR_EL1 = ")
mrs x0, s3_1_c11_c0_2
bl print_x0
+#endif
PRINT("ID_AA64MPFR0_EL1 = ")
mrs x0, id_aa64pfr0_el1
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Mon Oct 1 17:50:08 UTC 2018
Modified Files:
src/distrib/alpha/instkernel/ramdisk: list
src/distrib/amd64/ramdisks/common: list.ramdisk
src/distrib/sparc64/instfs: list
src/distrib/utils/x_gzip: Makefile
Log Message:
Make gzip on some crunched install media support xz decompression
(just like our base version does).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/alpha/instkernel/ramdisk/list
cvs rdiff -u -r1.20 -r1.21 src/distrib/amd64/ramdisks/common/list.ramdisk
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/instfs/list
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/instkernel/ramdisk/list
diff -u src/distrib/alpha/instkernel/ramdisk/list:1.45 src/distrib/alpha/instkernel/ramdisk/list:1.46
--- src/distrib/alpha/instkernel/ramdisk/list:1.45 Sat Aug 2 19:35:13 2014
+++ src/distrib/alpha/instkernel/ramdisk/list Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.45 2014/08/02 19:35:13 martin Exp $
+# $NetBSD: list,v 1.46 2018/10/01 17:50:08 martin Exp $
SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
@@ -61,7 +61,7 @@ ARGVLN sh -sh
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ping srcdir distrib/utils/x_ping
-LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
# we need the boot blocks /usr/mdec
COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.20 src/distrib/amd64/ramdisks/common/list.ramdisk:1.21
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.20 Wed Oct 7 14:09:04 2015
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.20 2015/10/07 14:09:04 martin Exp $
+# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -66,7 +66,7 @@ SPECIAL route srcdir distrib/utils/x_ro
ARGVLN sh -sh
# libhack.o is built by Makefile & included Makefile.inc
-LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
Index: src/distrib/sparc64/instfs/list
diff -u src/distrib/sparc64/instfs/list:1.27 src/distrib/sparc64/instfs/list:1.28
--- src/distrib/sparc64/instfs/list:1.27 Fri Sep 28 15:05:23 2018
+++ src/distrib/sparc64/instfs/list Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.27 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: list,v 1.28 2018/10/01 17:50:08 martin Exp $
SRCDIRS bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
@@ -79,7 +79,7 @@ SPECIAL route srcdir distrib/utils/x_ro
# SPECIAL xz srcdir external/public-domain/xz/bin
LIBS libhack.o
-LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -lprop
+LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -llzma -lprop
# various files that we need in /etc for the install
COPY ${NETBSDSRCDIR}/etc/group etc/group
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.8 src/distrib/utils/x_gzip/Makefile:1.9
--- src/distrib/utils/x_gzip/Makefile:1.8 Sun Jun 19 01:25:35 2011
+++ src/distrib/utils/x_gzip/Makefile Mon Oct 1 17:50:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/06/19 01:25:35 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2018/10/01 17:50:08 martin Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -10,10 +10,12 @@ CPPFLAGS+= -DSMALL
CPPFLAGS+= -DNO_BZIP2_SUPPORT
CPPFLAGS+= -DNO_COMPRESS_SUPPORT
CPPFLAGS+= -DNO_PACK_SUPPORT
-CPPFLAGS+= -DNO_XZ_SUPPORT
+CPPFLAGS+= ${"${USE_XZ_SETS:Uno}"!="no":?:-DNO_XZ_SUPPORT}
-DPADD= ${LIBZ}
-LDADD= -lz
+# for crunched binaries this does not take effect, also check the
+# LIBS entry in the lists file
+DPADD= ${LIBZ} ${LIBLZMA}
+LDADD= -lz -llzma
.include
CVS commit: src/external/cddl/dtracetoolkit/dist
Module Name:src
Committed By: sevan
Date: Mon Oct 1 13:28:07 UTC 2018
Modified Files:
src/external/cddl/dtracetoolkit/dist: iosnoop
Log Message:
Sync with version on Brendan's site
http://www.brendangregg.com/DTrace/iosnoop
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/cddl/dtracetoolkit/dist/iosnoop
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/dtracetoolkit/dist/iosnoop
diff -u src/external/cddl/dtracetoolkit/dist/iosnoop:1.1.1.1 src/external/cddl/dtracetoolkit/dist/iosnoop:1.2
--- src/external/cddl/dtracetoolkit/dist/iosnoop:1.1.1.1 Wed Sep 30 22:01:06 2015
+++ src/external/cddl/dtracetoolkit/dist/iosnoop Mon Oct 1 13:28:07 2018
@@ -1,12 +1,14 @@
-#!/usr/bin/sh
+#!/bin/sh
#
# iosnoop - A program to print disk I/O events as they happen, with useful
-# details such as UID, PID, filename, command, etc.
-# Written using DTrace (Solaris 10 3/05).
+# details such as UID, PID, filename (if available), command, etc.
+# Written using DTrace (Solaris 10 3/05, MacOS X 10.5).
#
-# This is measuring disk events that have made it past system caches.
+# This is measuring events that have made it past system caches, such as
+# disk events for local file systems, and network events for remote
+# filesystems (such as NFS.)
#
-# $Id: iosnoop,v 1.1.1.1 2015/09/30 22:01:06 christos Exp $
+# $Id: iosnoop,v 1.2 2018/10/01 13:28:07 sevan Exp $
#
# USAGE: iosnoop [-a|-A|-DeghiNostv] [-d device] [-f filename]
# [-m mount_point] [-n name] [-p PID]
@@ -67,7 +69,7 @@
# Solaris Dynamic Tracing Guide, http://docs.sun.com
# DTrace Tools, http://www.brendangregg.com/dtrace.html
#
-# COPYRIGHT: Copyright (c) 2005 Brendan Gregg.
+# COPYRIGHT: Copyright (c) 2009 Brendan Gregg.
#
# CDDL HEADER START
#
@@ -83,8 +85,6 @@
#
# CDDL HEADER END
#
-# Author: Brendan Gregg [Sydney, Australia]
-#
# 12-Mar-2004 Brendan Gregg Created this, build 51.
# 23-May-2004 " " Fixed mntpt bug.
# 10-Oct-2004 " " Rewritten to use the io provider, build 63.
@@ -93,7 +93,7 @@
# 15-Jul-2005 " " Improved DTIME calculation.
# 25-Jul-2005 " " Added -p, -n. Improved code.
# 17-Sep-2005 " " Increased switchrate.
-# 17-Sep-2005 " " Last update.
+# 15-Sep-2009 " " Removed genunix for both MacOS X and NFS.
#
@@ -199,6 +199,9 @@ fi
#pragma D option quiet
#pragma D option switchrate=10hz
+ /* boost the following if you get "dynamic variable drops" */
+ #pragma D option dynvarsize=16m
+
/*
* Print header
*/
@@ -207,14 +210,14 @@ fi
last_event[""] = 0;
/* print optional headers */
- OPT_start ? printf("%-14s ","STIME") : 1;
- OPT_end ? printf("%-14s ","TIME"): 1;
+ OPT_start ? printf("%-14s ","STIME(us)") : 1;
+ OPT_end ? printf("%-14s ","TIME(us)"): 1;
OPT_endstr ? printf("%-20s ","STRTIME") : 1;
OPT_devname ? printf("%-7s ","DEVICE") : 1;
OPT_ins ? printf("%-3s ","INS") : 1;
OPT_nums? printf("%-3s %-3s ","MAJ","MIN") : 1;
- OPT_delta ? printf("%-10s ","DELTA") : 1;
- OPT_dtime ? printf("%-10s ","DTIME") : 1;
+ OPT_delta ? printf("%-10s ","DELTA(us)") : 1;
+ OPT_dtime ? printf("%-10s ","DTIME(us)") : 1;
/* print main headers */
OPT_dump ?
@@ -230,7 +233,7 @@ fi
/*
* Check event is being traced
*/
- io:genunix::start
+ io:::start
{
/* default is to trace unless filtering, */
self->ok = FILTER ? 0 : 1;
@@ -247,7 +250,7 @@ fi
* Reset last_event for disk idle -> start
* this prevents idle time being counted as disk time.
*/
- io:genunix::start
+ io:::start
/! pending[args[1]->dev_statname]/
{
/* save last disk event */
@@ -257,7 +260,7 @@ fi
/*
* Store entry details
*/
- io:genunix::start
+ io:::start
/self->ok/
{
/* these are used as a unique disk event key, */
@@ -281,7 +284,7 @@ fi
/*
* Process and Print completion
*/
- io:genunix::done
+ io:::done
/start_time[args[0]->b_edev, args[0]->b_blkno]/
{
/* decrease disk event pending count */
@@ -359,7 +362,7 @@ fi
* Prevent pending from underflowing
* this can happen if this program is started during disk events.
*/
- io:genunix::done
+ io:::done
/pending[args[1]->dev_statname] < 0/
{
pending[args[1]->dev_statname] = 0;
CVS commit: src/share/man/man5
Module Name:src Committed By: uwe Date: Mon Oct 1 11:16:04 UTC 2018 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Use more .Ql (quoted literal) for variable values. Misc markup fixes. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.176 src/share/man/man5/rc.conf.5:1.177 --- src/share/man/man5/rc.conf.5:1.176 Mon Oct 1 07:11:27 2018 +++ src/share/man/man5/rc.conf.5 Mon Oct 1 11:16:04 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.176 2018/10/01 07:11:27 wiz Exp $ +.\" $NetBSD: rc.conf.5,v 1.177 2018/10/01 11:16:04 uwe Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -123,21 +123,23 @@ Enabling variables, such as .Sy inetd , are generally named after the program or the system they enable, and have boolean values (specified using -.Sq Ic YES , -.Sq Ic TRUE , -.Sq Ic ON +.Ql YES , +.Ql TRUE , +.Ql ON or -.Sq Ic 1 +.Ql 1 for true, and -.Sq Ic NO , -.Sq Ic FALSE , -.Sq Ic OFF +.Ql NO , +.Ql FALSE , +.Ql OFF or -.Sq Ic 0 +.Ql 0 for false, with the values being case insensitive). Flags variables, such as .Sy inetd_flags -have the same name with "_flags" appended, and determine what +have the same name with +.Dq _flags +appended, and determine what arguments are passed to the program if it is enabled. .Pp If a variable that @@ -218,10 +220,10 @@ is true. The default value of .Va rc_silent_cmd is -.Dq twiddle , +.Ql twiddle , which will display a spinning symbol instead of each line of output. Another useful value is -.Dq \&: , +.Ql \&: , which will display nothing at all. .El .Ss Basic network configuration @@ -300,9 +302,9 @@ is part of this, because it is needed by .Xr dhcpcd 8 which may be required to get the network operational. The default is -.Dq "OPTIONAL:/var" , +.Ql "OPTIONAL:" Ns Pa /var , where the -.Dq "OPTIONAL:" +.Ql "OPTIONAL:" prefix means that it's not an error if the file system is not present in .Xr fstab 5 . @@ -313,9 +315,9 @@ File systems such as that may require network services to be available to mount, that must be available early in the system boot for general services to use. The default is -.Dq "OPTIONAL:/usr" , +.Ql "OPTIONAL:" Ns Pa /usr , where the -.Dq "OPTIONAL:" +.Ql "OPTIONAL:" prefix means that it is not an error if the file system is not present in .Xr fstab 5 . @@ -460,7 +462,7 @@ directory. can be used to override the default location of the .Dq real temporary directories, -.Dq Pa /private/tmp . +.Pa /private/tmp . See .Xr security 7 for additional details. @@ -556,7 +558,7 @@ Passes The directory where crash dumps are stored is specified by .Sy savecore_dir . The default setting is -.Dq Pa /var/crash . +.Pa /var/crash . .It Sy sysdb Boolean value. Builds various system databases, including @@ -667,7 +669,7 @@ Sets the variable (see below) to the output of .Xr ifconfig 8 with the -.Dq Li -l +.Fl l flag and suppresses warnings about interfaces in this list that do not have an ifconfig file or variable. .It Sy blacklistd @@ -726,21 +728,20 @@ List of .Sq Em "address netmask" pairs to configure additional network addresses for the given configured interface -.Dq * (e.g. .Sy ifaliases_le0 ) . If .Em netmask is -.Dq - , +.Ql - , then use the default netmask for the interface. .Pp .Sy ifaliases_* covers limited cases only and is considered unrecommended. We recommend using -.Sy ifconfig_nnX +.Sy ifconfig_xxN variables or -.Pa /etc/ifconfig.xxN +.Pa /etc/ifconfig. Ns Ar xxN files with multiple lines instead. .It Sy ifwatchd Boolean value. @@ -753,14 +754,14 @@ Fine grain control of address and routin .It Sy ip6addrctl_policy A string. Can be: -.Bl -tag -width auto -compact -.It Li auto +.Bl -tag -width "Ql auto" -compact +.It Ql auto automatically determine from system settings; will read priorities from .Pa /etc/ip6addrctl.conf or if that file does not exist it will default to IPv6 first, then IPv4. -.It Li ipv4_prefer +.It Ql ipv4_prefer try IPv4 before IPv6. -.It Li ipv6_prefer +.It Ql ipv6_prefer try IPv6 before IPv4. .El .It Sy ip6addrctl_verbose @@ -777,10 +778,10 @@ based on the information advertised by a By setting .Sy ip6mode to -.Dq Li router , -.Dq Li host , +.Ql router , +.Ql host , or -.Dq Li autohost , +.Ql autohost , you can configure your node as a router, a non-autoconfigured host, or an autoconfigured host. Invalid values will be ignored, and the node will be configured as @@ -790,7 +791,7 @@ Boolean value. If .Sy ip6mode is equal to -.Dq Li router , +.Ql router , and .Sy ip6uniquelocal is false, @@ -835,21 +836,20 @@ A string. Specifies arguments to supply to .Xr ipmon 8 . Defaults to -.Dq Li -ns . +.Ql -ns . A typical example would be -.Dq Fl nD
CVS commit: src
Module Name:src
Committed By: martin
Date: Mon Oct 1 09:47:34 UTC 2018
Modified Files:
src/distrib/sets: Makefile
src/etc: Makefile
Log Message:
Redo xz vs. gzip selection via conditional make expressions, suggested
by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/Makefile
cvs rdiff -u -r1.436 -r1.437 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.105 src/distrib/sets/Makefile:1.106
--- src/distrib/sets/Makefile:1.105 Sat Sep 29 06:36:29 2018
+++ src/distrib/sets/Makefile Mon Oct 1 09:47:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/09/29 06:36:29 kre Exp $
+# $NetBSD: Makefile,v 1.106 2018/10/01 09:47:34 martin Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -15,15 +15,10 @@ all:
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
-COMPRESS_PROGRAM=${TOOL_XZ}
-XZ_OPT=-9
-TAR_SUFF=tar.xz
-.else
-COMPRESS_PROGRAM=${TOOL_GZIP}
-GZIP_FLAGS= ${GZIP_N_FLAG}
-TAR_SUFF=tgz
-.endif
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
+TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
+XZ_OPT= -9
+GZIP_FLAGS= ${GZIP_N_FLAG}
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.436 src/etc/Makefile:1.437
--- src/etc/Makefile:1.436 Sat Sep 29 06:10:01 2018
+++ src/etc/Makefile Mon Oct 1 09:47:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.436 2018/09/29 06:10:01 martin Exp $
+# $NetBSD: Makefile,v 1.437 2018/10/01 09:47:34 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -410,14 +410,9 @@ install-obsolete-lists: .PHONY .MAKE
distrib-dirs: .PHONY check_DESTDIR
cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
-.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
-COMPRESS_PROGRAM=${TOOL_XZ}
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
XZ_OPT=-9
-TAR_SUFF=tar.xz
-.else
-COMPRESS_PROGRAM=${TOOL_GZIP}
-TAR_SUFF=tgz
-.endif
+TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
# release, snapshot --
# Build a full distribution including kernels & install media.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: bouyer
Date: Mon Oct 1 09:39:20 UTC 2018
Modified Files:
src/sys/dev/i2c: gttwsi_core.c
Log Message:
Expand code covered by sc->sc_mtx, to make sure an interrupt would not be
handled before the cv_timedwait_sig() call, or while polling.
Seems to fix "sunxitwi0: send STOP failed" messages frequently seen related
to axp20x0 sensors.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/i2c/gttwsi_core.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/i2c/gttwsi_core.c
diff -u src/sys/dev/i2c/gttwsi_core.c:1.7 src/sys/dev/i2c/gttwsi_core.c:1.8
--- src/sys/dev/i2c/gttwsi_core.c:1.7 Mon Jun 18 12:42:29 2018
+++ src/sys/dev/i2c/gttwsi_core.c Mon Oct 1 09:39:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gttwsi_core.c,v 1.7 2018/06/18 12:42:29 jakllsch Exp $ */
+/* $NetBSD: gttwsi_core.c,v 1.8 2018/10/01 09:39:20 bouyer Exp $ */
/*
* Copyright (c) 2008 Eiji Kawauchi.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.7 2018/06/18 12:42:29 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.8 2018/10/01 09:39:20 bouyer Exp $");
#include "locators.h"
#include
@@ -192,15 +192,15 @@ gttwsi_intr(void *arg)
struct gttwsi_softc *sc = arg;
uint32_t val;
+ mutex_enter(>sc_mtx);
val = gttwsi_read_4(sc, TWSI_CONTROL);
if (val & CONTROL_IFLG) {
gttwsi_write_4(sc, TWSI_CONTROL, val & ~CONTROL_INTEN);
- mutex_enter(>sc_mtx);
cv_broadcast(>sc_cv);
mutex_exit(>sc_mtx);
-
return 1; /* handled */
}
+ mutex_exit(>sc_mtx);
return 0;
}
@@ -377,6 +377,7 @@ gttwsi_wait(struct gttwsi_softc *sc, uin
control |= CONTROL_INTEN;
if (sc->sc_iflg_rwc)
control |= CONTROL_IFLG;
+ mutex_enter(>sc_mtx);
gttwsi_write_4(sc, TWSI_CONTROL, control | CONTROL_TWSIEN);
timo = 0;
@@ -385,17 +386,21 @@ gttwsi_wait(struct gttwsi_softc *sc, uin
if (control & CONTROL_IFLG)
break;
if (!(flags & I2C_F_POLL)) {
- mutex_enter(>sc_mtx);
error = cv_timedwait_sig(>sc_cv, >sc_mtx, hz);
- mutex_exit(>sc_mtx);
if (error)
-return error;
+break;
+ } else {
+ DELAY(TWSI_RETRY_DELAY);
+ if (timo++ > 100) /* 1sec */
+break;
}
- DELAY(TWSI_RETRY_DELAY);
- if (timo++ > 100) /* 1sec */
- break;
}
-
+ if ((control & CONTROL_IFLG) == 0) {
+ aprint_error_dev(sc->sc_dev,
+ "gttwsi_wait(): timeout, control=0x%x\n", control);
+ error = EWOULDBLOCK;
+ goto end;
+ }
status = gttwsi_read_4(sc, TWSI_STATUS);
if (status != expect) {
/*
@@ -408,7 +413,9 @@ gttwsi_wait(struct gttwsi_softc *sc, uin
aprint_error_dev(sc->sc_dev,
"unexpected status 0x%x: expect 0x%x\n", status,
expect);
- return EIO;
+ error = EIO;
}
+end:
+ mutex_exit(>sc_mtx);
return error;
}
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: jmcneill Date: Mon Oct 1 08:23:53 UTC 2018 Modified Files: src/distrib/sets/lists/debug: md.amd64 md.i386 mi Log Message: Fix debug sets for mount_qemufwcfg To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/md.i386 cvs rdiff -u -r1.268 -r1.269 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.101 src/distrib/sets/lists/debug/md.amd64:1.102 --- src/distrib/sets/lists/debug/md.amd64:1.101 Fri Jul 13 09:15:55 2018 +++ src/distrib/sets/lists/debug/md.amd64 Mon Oct 1 08:23:53 2018 @@ -1,10 +1,9 @@ -# $NetBSD: md.amd64,v 1.101 2018/07/13 09:15:55 maxv Exp $ +# $NetBSD: md.amd64,v 1.102 2018/10/01 08:23:53 jmcneill Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete ./usr/lib/libx86_64_g.acomp-c-debuglib debuglib ./usr/libdata/debug/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat -./usr/libdata/debug/sbin/mount_qemufwcfg.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/pmc.debug comp-obsolete obsolete Index: src/distrib/sets/lists/debug/md.i386 diff -u src/distrib/sets/lists/debug/md.i386:1.17 src/distrib/sets/lists/debug/md.i386:1.18 --- src/distrib/sets/lists/debug/md.i386:1.17 Sat Aug 25 11:10:52 2018 +++ src/distrib/sets/lists/debug/md.i386 Mon Oct 1 08:23:53 2018 @@ -1,10 +1,9 @@ -# $NetBSD: md.i386,v 1.17 2018/08/25 11:10:52 martin Exp $ +# $NetBSD: md.i386,v 1.18 2018/10/01 08:23:53 jmcneill Exp $ ./usr/lib/libi386_g.acomp-c-debuglib debuglib ./usr/lib/libm387_g.acomp-c-debuglib debuglib ./usr/lib/libpmc_g.acomp-obsolete obsolete ./usr/libdata/debug/lib/libm387.so.0.1.debug comp-sys-debug pic,debug ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic -./usr/libdata/debug/sbin/mount_qemufwcfg.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/pmc.debug comp-obsolete obsolete Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.268 src/distrib/sets/lists/debug/mi:1.269 --- src/distrib/sets/lists/debug/mi:1.268 Sun Sep 23 13:36:04 2018 +++ src/distrib/sets/lists/debug/mi Mon Oct 1 08:23:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.268 2018/09/23 13:36:04 christos Exp $ +# $NetBSD: mi,v 1.269 2018/10/01 08:23:53 jmcneill Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -377,6 +377,7 @@ ./usr/libdata/debug/sbin/mount_procfs.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/mount_ptyfs.debug comp-miscfs-debug debug ./usr/libdata/debug/sbin/mount_puffs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/mount_qemufwcfg.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/mount_smbfs.debug comp-smbfs-debug debug ./usr/libdata/debug/sbin/mount_sysvbfs.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/mount_tmpfs.debug comp-miscfs-debug debug
CVS commit: [pgoyette-compat] src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Mon Oct 1 07:33:36 UTC 2018 Modified Files: src/sys/arch/amd64/conf [pgoyette-compat]: NOCOMPAT Log Message: Sync with changes from HEAD: no more ATM To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/amd64/conf/NOCOMPAT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/NOCOMPAT diff -u src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.3 src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.4 --- src/sys/arch/amd64/conf/NOCOMPAT:1.1.2.3 Sun Mar 11 23:49:32 2018 +++ src/sys/arch/amd64/conf/NOCOMPAT Mon Oct 1 07:33:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: NOCOMPAT,v 1.1.2.3 2018/03/11 23:49:32 pgoyette Exp $ +# $NetBSD: NOCOMPAT,v 1.1.2.4 2018/10/01 07:33:36 pgoyette Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1.2.3 $" +#ident "GENERIC-$Revision: 1.1.2.4 $" maxusers 64 # estimated number of users @@ -763,7 +763,6 @@ bge* at pci? dev ? function ? # Broadcom bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless dge* at pci? dev ? function ? # Intel 82597 10GbE LR -en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Mon Oct 1 07:11:27 UTC 2018 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.175 src/share/man/man5/rc.conf.5:1.176 --- src/share/man/man5/rc.conf.5:1.175 Sun Sep 30 10:38:05 2018 +++ src/share/man/man5/rc.conf.5 Mon Oct 1 07:11:27 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.175 2018/09/30 10:38:05 martin Exp $ +.\" $NetBSD: rc.conf.5,v 1.176 2018/10/01 07:11:27 wiz Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -353,10 +353,14 @@ Remove block-type swap devices at shutdo Useful if swapping onto RAIDframe devices. .It Sy var_shm_symlink A path. -If set, names a path that /var/shm will be symlinked to. +If set, names a path that +.Pa /var/shm +will be symlinked to. .Pp The path needs to live on a tmpfs file system. -A typical value (assuming /tmp is mounted on tmpfs) would be +A typical value (assuming +.Pa /tmp +is mounted on tmpfs) would be .Pa /tmp/.shm . .El .Ss Block device subsystems
