CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Sat May 1 00:08:44 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: lex.c
Log Message:
put back nonnull. I meant to just sort it.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/lex.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/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.30 src/usr.bin/xlint/lint1/lex.c:1.31
--- src/usr.bin/xlint/lint1/lex.c:1.30 Fri Apr 30 15:46:24 2021
+++ src/usr.bin/xlint/lint1/lex.c Fri Apr 30 20:08:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.30 2021/04/30 19:46:24 christos Exp $ */
+/* $NetBSD: lex.c,v 1.31 2021/05/01 00:08:44 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: lex.c,v 1.30 2021/04/30 19:46:24 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.31 2021/05/01 00:08:44 christos Exp $");
#endif
#include
@@ -190,6 +190,7 @@ static struct kwtab {
kwdef_token( "no_instrument_function",
T_AT_NO_INSTRUMENT_FUNCTION, 0,0,1,1,5),
kwdef_token( "noinline", T_AT_NOINLINE, 0,0,1,1,5),
+ kwdef_token( "nonnull", T_AT_NONNULL, 0,0,1,1,5),
kwdef_token( "nonstring", T_AT_NONSTRING, 0,0,1,1,5),
kwdef_token( "noreturn", T_AT_NORETURN, 0,0,1,1,5),
kwdef_token( "nothrow", T_AT_NOTHROW, 0,0,1,1,5),
CVS commit: src
Module Name:src
Committed By: rillig
Date: Fri Apr 30 23:49:36 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh
Added Files:
src/tests/usr.bin/xlint/lint1: gcc_attribute.c gcc_attribute.exp
Log Message:
tests/lint: add very basic tests for GCC __attribute__
To generate a diff of this commit:
cvs rdiff -u -r1.1046 -r1.1047 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.52 -r1.53 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/gcc_attribute.c \
src/tests/usr.bin/xlint/lint1/gcc_attribute.exp
cvs rdiff -u -r1.44 -r1.45 src/tests/usr.bin/xlint/lint1/t_integration.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1046 src/distrib/sets/lists/tests/mi:1.1047
--- src/distrib/sets/lists/tests/mi:1.1046 Tue Apr 27 16:20:06 2021
+++ src/distrib/sets/lists/tests/mi Fri Apr 30 23:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1046 2021/04/27 16:20:06 rillig Exp $
+# $NetBSD: mi,v 1.1047 2021/04/30 23:49:36 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6191,6 +6191,8 @@
./usr/tests/usr.bin/xlint/lint1/emit.lntests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/feat_stacktrace.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/feat_stacktrace.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_attribute.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_attribute.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.52 src/tests/usr.bin/xlint/lint1/Makefile:1.53
--- src/tests/usr.bin/xlint/lint1/Makefile:1.52 Thu Apr 22 22:43:26 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Fri Apr 30 23:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2021/04/22 22:43:26 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2021/04/30 23:49:36 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 343 # see lint1/err.c
@@ -105,6 +105,8 @@ FILES+= emit.exp
FILES+= emit.ln
FILES+= feat_stacktrace.c
FILES+= feat_stacktrace.exp
+FILES+= gcc_attribute.c
+FILES+= gcc_attribute.exp
FILES+= gcc_init_compound_literal.c
FILES+= gcc_init_compound_literal.exp
FILES+= gcc_typeof_after_statement.c
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.44 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.45
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.44 Thu Apr 22 22:43:26 2021
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Fri Apr 30 23:49:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.44 2021/04/22 22:43:26 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.45 2021/04/30 23:49:36 rillig Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -179,6 +179,7 @@ test_case d_long_double_int
test_case emit
+test_case gcc_attribute
test_case gcc_init_compound_literal
test_case gcc_typeof_after_statement
Added files:
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/gcc_attribute.c:1.1
--- /dev/null Fri Apr 30 23:49:37 2021
+++ src/tests/usr.bin/xlint/lint1/gcc_attribute.c Fri Apr 30 23:49:36 2021
@@ -0,0 +1,28 @@
+/* $NetBSD: gcc_attribute.c,v 1.1 2021/04/30 23:49:36 rillig Exp $ */
+# 3 "gcc_attribute.c"
+
+/*
+ * Tests for the various attributes for functions, types, statements that are
+ * provided by GCC.
+ *
+ * https://gcc.gnu.org/onlinedocs/gcc/Attribute-Syntax.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Variable-Attributes.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Type-Attributes.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Enumerator-Attributes.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Statement-Attributes.html
+ * https://gcc.gnu.org/onlinedocs/gcc/Label-Attributes.html
+ */
+
+void __attribute__((noinline))
+do_not_inline(void)
+{
+}
+
+/* expect+1: syntax error 'nonnull' */
+void __attribute__((nonnull(1, 2)))
+my_memcpy(void *dest, const void *src, unsigned long len);
+
+/* expect+1: syntax error 'unknown_attribute' */
+void __attribute__((unknown_attribute))
+function_with_unknown_attribute(void);
Index: src/tests/usr.bin/xlint/lint1/gcc_attribute.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/gcc_attribute.exp:1.1
--- /dev/null Fri Apr 30
CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd
Module Name:src
Committed By: rillig
Date: Fri Apr 30 22:48:38 UTC 2021
Modified Files:
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64:
Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64:
Makefile
Log Message:
compiler_rt: generate symbol table early
These libraries have the special feature that they install both the .a
library as well as the .a.syms that is generated from them. To avoid
the transformation rule .a.a.syms to apply to the files in ${DESTDIR},
that rule has to be disabled during the installation phase.
If the transformation rule were active during installation, the .a.syms
file in ${DESTDIR} would have more than one possible source file, which
eventually leads to an error during installation since in the command
"install a b c", the last argument must be a directory, not a file.
The installation phase should be as minimal as possible anyway,
therefore move the generation of the .syms files to the build phase.
This hopefully fixes the build for HAVE_LLVM=yes, which has been broken
for several weeks now, at least for the official builds.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
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/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.4 Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
NOSANITIZER=# defined
@@ -57,7 +57,7 @@ COPTS+= -fPIC
SYMS= libclang_rt.asan-x86_64.a.syms
SYMS_EXTRA= ${TOPDIR}/lib/asan/asan.syms.extra
-beforeinstall: ${SYMS}
+all: ${SYMS}
CLEANFILES+= ${SYMS}
FILES= ${SYMS}
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.4 Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
NOSANITIZER=# defined
@@ -40,7 +40,7 @@ COPTS+= -fPIC
SYMS= libclang_rt.asan_cxx-x86_64.a.syms
SYMS_EXTRA= ${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
-beforeinstall: ${SYMS}
+all: ${SYMS}
CLEANFILES+= ${SYMS}
FILES= ${SYMS}
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.4 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.5
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.4 Fri Aug 30 23:36:40 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile Fri Apr 30 22:48:37 2021
@@ -1,4 +1,4
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Apr 30 22:22:49 UTC 2021 Modified Files: src/doc: CHANGES Log Message: Mention resolver change, and fix 2020 entries that should have been 2021 To generate a diff of this commit: cvs rdiff -u -r1.2800 -r1.2801 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2800 src/doc/CHANGES:1.2801 --- src/doc/CHANGES:1.2800 Thu Apr 29 13:29:06 2021 +++ src/doc/CHANGES Fri Apr 30 18:22:49 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2800 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2801 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -352,17 +352,20 @@ Changes from NetBSD 9.0 to NetBSD 10.0: file(1): Upgraded to 5.40. [christos 20210409] pkg_install: Updated to 20210410. This simplifes version checking for NetBSD. [nia 20210410] - gcc(1): Import GCC 10.3. [mrg 20200410] - alpha: Switch to GCC 10. [mrg 20200416] - amd64: Switch to GCC 10. [mrg 20200416] - ia64: Switch to GCC 10. [mrg 20200416] - riscv: Switch to GCC 10. [mrg 20200416] - sparc: Switch to GCC 10. [mrg 20200416] - sparc64: Switch to GCC 10. [mrg 20200416] - vax: Switch to GCC 10. [mrg 20200416] + gcc(1): Import GCC 10.3. [mrg 20210410] + alpha: Switch to GCC 10. [mrg 20210416] + amd64: Switch to GCC 10. [mrg 20210416] + ia64: Switch to GCC 10. [mrg 20210416] + riscv: Switch to GCC 10. [mrg 20210416] + sparc: Switch to GCC 10. [mrg 20210416] + sparc64: Switch to GCC 10. [mrg 20210416] + vax: Switch to GCC 10. [mrg 20210416] tmux(1): Imported 3.2. [christos 20210417] - hppa: Switch to GCC 10. [skrll 20200418] + hppa: Switch to GCC 10. [skrll 20210418] OpenSSH: Import 8.6. [christos 20210419] - powerpc: Switch to GCC 10. [mrg 20200425] - aarch64: Switch to GCC 10. [mrg 20200425] + powerpc: Switch to GCC 10. [mrg 20210425] + aarch64: Switch to GCC 10. [mrg 20210425] bind: Import version 9.16.15. [christos 20210429] + resolver: The default has been changed to check-names + (see resolv.conf(5)), which means that hostnames that + contain invalid characters will not resolve. [christos 20210430]
CVS commit: src/usr.bin/xlint/arch/mipsn64
Module Name:src Committed By: christos Date: Fri Apr 30 21:51:49 UTC 2021 Added Files: src/usr.bin/xlint/arch/mipsn64: targparam.h Log Message: add for mipsn64 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.bin/xlint/arch/mipsn64/targparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/usr.bin/xlint/arch/mipsn64/targparam.h diff -u /dev/null src/usr.bin/xlint/arch/mipsn64/targparam.h:1.1 --- /dev/null Fri Apr 30 17:51:49 2021 +++ src/usr.bin/xlint/arch/mipsn64/targparam.h Fri Apr 30 17:51:48 2021 @@ -0,0 +1,55 @@ +/* $NetBSD: targparam.h,v 1.1 2021/04/30 21:51:48 christos Exp $ */ + +/* + * Copyright (c) 1994, 1995 Jochen Pohl + * All Rights Reserved. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + * This product includes software developed by Jochen Pohl for + * The NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + *derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/* + * Machine-dependent target parameters for lint1. + */ +#include "schar.h" +// This is for __mips_n64 +#include "lp64.h" + +/* + * Should be set to 1 if the difference of two pointers is of type long + * or the value of sizeof is of type unsigned long. Note this MUST be + * kept in sync with the compiler! + */ + +#define PTRDIFF_TSPEC LONG +#define SIZEOF_TSPEC ULONG +#define INTPTR_TSPEC LONG + +#define FLOAT_SIZE 32 +#define DOUBLE_SIZE 64 +#define LDOUBLE_SIZE 128 + +#define ENUM_SIZE 32
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: nia Date: Fri Apr 30 21:07:34 UTC 2021 Modified Files: src/sbin/cgdconfig: cgdconfig.8 Log Message: cgdconfig.8: use gpt in examples, it's more versatile for this use case To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sbin/cgdconfig/cgdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.8 diff -u src/sbin/cgdconfig/cgdconfig.8:1.49 src/sbin/cgdconfig/cgdconfig.8:1.50 --- src/sbin/cgdconfig/cgdconfig.8:1.49 Sun Apr 18 19:56:09 2021 +++ src/sbin/cgdconfig/cgdconfig.8 Fri Apr 30 21:07:34 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: cgdconfig.8,v 1.49 2021/04/18 19:56:09 maya Exp $ +.\" $NetBSD: cgdconfig.8,v 1.50 2021/04/30 21:07:34 nia Exp $ .\" .\" Copyright (c) 2002, The NetBSD Foundation, Inc. .\" All rights reserved. @@ -387,14 +387,14 @@ when we configure the first time to set Here is the sequence of commands that is recommended: .Bd -literal - # cgdconfig -g -o /etc/cgd/wd0e -V disklabel adiantum - # cgdconfig -V re-enter cgd0 /dev/wd0e - /dev/wd0e's passphrase: + # cgdconfig -g -o /etc/cgd/dk3 -V gpt adiantum + # cgdconfig -V re-enter cgd0 /dev/dk3 + /dev/dk3's passphrase: re-enter device's passphrase: - # disklabel -e -I cgd0 + # gpt create cgd0 # cgdconfig -u cgd0 - # cgdconfig cgd0 /dev/wd0e - /dev/wd0e's passphrase: + # cgdconfig cgd0 /dev/dk3 + /dev/dk3's passphrase: .Ed .Pp To scrub data from a disk before setting up a cgd:
CVS commit: src/sys/arch/aarch64
Module Name:src
Committed By: skrll
Date: Fri Apr 30 20:07:23 UTC 2021
Modified Files:
src/sys/arch/aarch64/aarch64: db_interface.c db_machdep.c pmap.c
pmapboot.c
src/sys/arch/aarch64/include: db_machdep.h pmap.h
Log Message:
Make the ddb for pmap / pte information pmap agnostic
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/aarch64/db_interface.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/aarch64/aarch64/pmapboot.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/include/db_machdep.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/aarch64/include/pmap.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/db_interface.c
diff -u src/sys/arch/aarch64/aarch64/db_interface.c:1.12 src/sys/arch/aarch64/aarch64/db_interface.c:1.13
--- src/sys/arch/aarch64/aarch64/db_interface.c:1.12 Fri Feb 5 21:44:34 2021
+++ src/sys/arch/aarch64/aarch64/db_interface.c Fri Apr 30 20:07:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.12 2021/02/05 21:44:34 joerg Exp $ */
+/* $NetBSD: db_interface.c,v 1.13 2021/04/30 20:07:22 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,13 +27,17 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.12 2021/02/05 21:44:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.13 2021/04/30 20:07:22 skrll Exp $");
#include
#include
#include
+#include
#include
+#ifdef __HAVE_PMAP_PV_TRACK
+#include
+#endif
#include
#include
@@ -53,6 +57,21 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
db_regs_t ddb_regs;
+static int
+db_validate_address(vaddr_t addr)
+{
+ struct proc *p = curproc;
+ struct pmap *pmap;
+
+ if (!p || !p->p_vmspace || !p->p_vmspace->vm_map.pmap ||
+ addr >= VM_MAXUSER_ADDRESS)
+ pmap = pmap_kernel();
+ else
+ pmap = p->p_vmspace->vm_map.pmap;
+
+ return (pmap_extract(pmap, addr, NULL) == false);
+}
+
void
db_read_bytes(vaddr_t addr, size_t size, char *data)
{
@@ -60,15 +79,15 @@ db_read_bytes(vaddr_t addr, size_t size,
const char *src;
for (src = (const char *)addr; size > 0;) {
+ const vaddr_t va = (vaddr_t)src;
uintptr_t tmp;
- if ((lastpage != atop((vaddr_t)src)) &&
- vtophys((vaddr_t)src) == VTOPHYS_FAILED) {
+ if (lastpage != atop(va) && db_validate_address(va)) {
db_printf("address %p is invalid\n", src);
memset(data, 0, size); /* stubs are filled by zero */
return;
}
- lastpage = atop((vaddr_t)src);
+ lastpage = atop(va);
if (aarch64_pan_enabled)
reg_pan_write(0); /* disable PAN */
@@ -120,9 +139,6 @@ db_write_text(vaddr_t addr, size_t size,
ptep = kvtopte(addr);
KASSERT(ptep != NULL);
- /* save pte */
- pte = *ptep;
-
/*
* change to writable. it is required to keep execute permission.
* because if the block/page to which the target address belongs is
@@ -130,7 +146,8 @@ db_write_text(vaddr_t addr, size_t size,
* if PROT_EXECUTE is dropped and TLB is invalidated, the program
* will stop...
*/
- pmap_kvattr(addr, VM_PROT_EXECUTE|VM_PROT_READ|VM_PROT_WRITE);
+ /* old pte is returned by pmap_kvattr */
+ pte = pmap_kvattr(ptep, VM_PROT_EXECUTE|VM_PROT_READ|VM_PROT_WRITE);
aarch64_tlbi_all();
s = size;
@@ -175,14 +192,14 @@ db_write_bytes(vaddr_t addr, size_t size
/* XXX: need to check read only block/page */
for (dst = (char *)addr; size > 0;) {
+ const vaddr_t va = (vaddr_t)dst;
uintptr_t tmp;
- if ((lastpage != atop((vaddr_t)dst)) &&
- (vtophys((vaddr_t)dst) == VTOPHYS_FAILED)) {
+ if (lastpage != atop(va) && db_validate_address(va)) {
db_printf("address %p is invalid\n", dst);
return;
}
- lastpage = atop((vaddr_t)dst);
+ lastpage = atop(va);
tmp = (uintptr_t)dst | (uintptr_t)data;
if ((size >= 8) && ((tmp & 7) == 0)) {
@@ -290,3 +307,313 @@ db_inst_unconditional_flow_transfer(db_e
return false;
}
+
+void
+db_pte_print(pt_entry_t pte, int level,
+void (*pr)(const char *, ...) __printflike(1, 2))
+{
+ if (pte == 0) {
+ pr(" UNUSED\n");
+ return;
+ }
+
+ pr(" %s", (pte & LX_VALID) ? "VALID" : "**INVALID**");
+
+ if ((level == 0) ||
+ ((level == 1) && l1pde_is_table(pte)) ||
+ ((level == 2) && l2pde_is_table(pte))) {
+
+ /* L0/L1/L2 TABLE */
+ if ((level == 0) && ((pte & LX_TYPE) != LX_TYPE_TBL))
+ pr(" **ILLEGAL TYPE**"); /* L0 doesn't support block */
+ else
+ pr(" L%d-TABLE", level);
+
+ pr(", PA=%lx", l0pde_pa(pte));
+
+ if (pte & LX_TBL_NSTABLE)
+ pr(", NSTABLE");
+ if (pte & LX_TBL_APTABLE)
+ pr(", APTABLE");
+ if (pte & LX_TBL_UXNTABLE)
+ pr(", UXNTABLE");
+ if (pte & LX_TBL_PXNTABLE)
+ pr(", PXNTABLE");
+
+ } else if (((level == 1) && l1pde_is_block(pte)) ||
+ ((level == 2) && l2pde_is_block(pte)) ||
+
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Fri Apr 30 19:46:24 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y lex.c
Log Message:
- add nonstring attribute
- allow attributes after labels (for unused)
XXX: split the attributes into function, variable, etc attributes
so that we don't accept all attributes in all places (only where they make
sense)
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/xlint/lint1/lex.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/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.222 src/usr.bin/xlint/lint1/cgram.y:1.223
--- src/usr.bin/xlint/lint1/cgram.y:1.222 Thu Apr 29 13:11:30 2021
+++ src/usr.bin/xlint/lint1/cgram.y Fri Apr 30 15:46:24 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.222 2021/04/29 17:11:30 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.223 2021/04/30 19:46:24 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.222 2021/04/29 17:11:30 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.223 2021/04/30 19:46:24 christos Exp $");
#endif
#include
@@ -123,7 +123,7 @@ anonymize(sym_t *s)
}
%}
-%expect 185
+%expect 189
%union {
val_t *y_val;
@@ -235,6 +235,7 @@ anonymize(sym_t *s)
%token T_AT_MODE
%token T_AT_NOINLINE
%token T_AT_NONNULL
+%token T_AT_NONSTRING
%token T_AT_NORETURN
%token T_AT_NOTHROW
%token T_AT_NO_INSTRUMENT_FUNCTION
@@ -563,6 +564,7 @@ type_attribute_spec:
| T_AT_SENTINEL
| T_AT_FORMAT_ARG T_LPAREN constant_expr T_RPAREN
| T_AT_NONNULL T_LPAREN constant_expr T_RPAREN
+ | T_AT_NONSTRING
| T_AT_MODE T_LPAREN T_NAME T_RPAREN
| T_AT_ALIAS T_LPAREN string T_RPAREN
| T_AT_OPTIMIZE T_LPAREN string T_RPAREN
@@ -1535,7 +1537,7 @@ statement: /* C99 6.8 */
;
labeled_statement: /* C99 6.8.1 */
- label statement
+ label opt_type_attribute statement
;
label:
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.29 src/usr.bin/xlint/lint1/lex.c:1.30
--- src/usr.bin/xlint/lint1/lex.c:1.29 Tue Apr 20 17:48:39 2021
+++ src/usr.bin/xlint/lint1/lex.c Fri Apr 30 15:46:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.29 2021/04/20 21:48:39 christos Exp $ */
+/* $NetBSD: lex.c,v 1.30 2021/04/30 19:46:24 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: lex.c,v 1.29 2021/04/20 21:48:39 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.30 2021/04/30 19:46:24 christos Exp $");
#endif
#include
@@ -189,8 +189,8 @@ static struct kwtab {
kwdef_token( "mode", T_AT_MODE, 0,0,1,1,5),
kwdef_token( "no_instrument_function",
T_AT_NO_INSTRUMENT_FUNCTION, 0,0,1,1,5),
- kwdef_token( "nonnull", T_AT_NONNULL, 0,0,1,1,5),
kwdef_token( "noinline", T_AT_NOINLINE, 0,0,1,1,5),
+ kwdef_token( "nonstring", T_AT_NONSTRING, 0,0,1,1,5),
kwdef_token( "noreturn", T_AT_NORETURN, 0,0,1,1,5),
kwdef_token( "nothrow", T_AT_NOTHROW, 0,0,1,1,5),
kwdef_token( "optimize", T_AT_OPTIMIZE, 0,0,1,1,5),
CVS commit: src/external/cddl/osnet/dist/cmd
Module Name:src Committed By: nia Date: Fri Apr 30 18:59:31 UTC 2021 Modified Files: src/external/cddl/osnet/dist/cmd/zfs: zfs.8 src/external/cddl/osnet/dist/cmd/zpool: zpool.8 Log Message: zfs: Fix up references to FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zfs/zfs.8 cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zpool/zpool.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/cmd/zfs/zfs.8 diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1 src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.2 --- src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1 Mon Jun 24 08:27:20 2019 +++ src/external/cddl/osnet/dist/cmd/zfs/zfs.8 Fri Apr 30 18:59:30 2021 @@ -285,12 +285,6 @@ .Op Fl FHt .Ar snapshot .Op Ar snapshot Ns | Ns Ar filesystem -.Nm -.Cm jail -.Ar jailid Ns | Ns Ar jailname filesystem -.Nm -.Cm unjail -.Ar jailid Ns | Ns Ar jailname filesystem .Sh DESCRIPTION The .Nm @@ -445,32 +439,6 @@ If a file system's mount point is set to .Tn ZFS makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. -.Ss Jails -.No A Tn ZFS -dataset can be attached to a jail by using the -.Qq Nm Cm jail -subcommand. You cannot attach a dataset to one jail and the children of the -same dataset to another jails. To allow management of the dataset from within -a jail, the -.Sy jailed -property has to be set and the jail needs access to the -.Pa /dev/zfs -device. The -.Sy quota -property cannot be changed from within a jail. See -.Xr jail 8 -for information on how to allow mounting -.Tn ZFS -datasets from within a jail. -.Pp -.No A Tn ZFS -dataset can be detached from a jail using the -.Qq Nm Cm unjail -subcommand. -.Pp -After a dataset is attached to a jail and the jailed property is set, a jailed -file system cannot be mounted outside the jail, since the jail administrator -might have set the mount point to an unacceptable value. .Ss Deduplication Deduplication is the process for removing redundant data at the block-level, reducing the total amount of data stored. If a file system has the @@ -1070,7 +1038,7 @@ signature to make sure the block content The .Sy devices property is currently not supported on -.Fx . +.Nx . .It Sy exec Ns = Ns Cm on | off Controls whether processes can be executed from within this file system. The default value is @@ -1079,7 +1047,7 @@ default value is The .Sy mlslabel property is currently not supported on -.Fx . +.Nx . .It Sy filesystem_limit Ns = Ns Ar count | Cm none Limits the number of filesystems and volumes that can exist under this point in the dataset tree. @@ -1118,7 +1086,7 @@ shared file systems are unshared and sha The .Sy nbmand property is currently not supported on -.Fx . +.Nx . .It Sy primarycache Ns = Ns Cm all | none | metadata Controls what is cached in the primary cache (ARC). If this property is set to .Cm all , @@ -1343,7 +1311,7 @@ bit is respected for the file system. Th The .Sy sharesmb property currently has no effect on -.Fx . +.Nx . .It Sy sharenfs Ns = Ns Cm on | off | Ar opts Controls whether the file system is shared via .Tn NFS , @@ -1493,17 +1461,12 @@ during volume creation and pool import. The .Sy vscan property is currently not supported on -.Fx . +.Nx . .It Sy xattr Ns = Ns Cm off | on The .Sy xattr property is currently not supported on -.Fx . -.It Sy jailed Ns = Ns Cm off | on -Controls whether the dataset is managed from a jail. See the -.Qq Sx Jails -section for more information. The default value is -.Cm off . +.Nx . .El .Pp The following three properties cannot be changed after the file system is @@ -2360,7 +2323,7 @@ The default is The default can be changed to include group types. .It Fl i Translate SID to POSIX ID. This flag currently has no effect on -.Fx . +.Nx . .El .It Xo .Nm @@ -2405,7 +2368,7 @@ file systems. Report mount progress. .It Fl O Perform an overlay mount. Overlay mounts are not supported on -.Fx . +.Nx . .It Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... An optional, comma-separated list of mount options to use temporarily for the duration of the mount. See the @@ -2416,7 +2379,7 @@ Mount all available .Tn ZFS file systems. This command may be executed on -.Fx +.Nx system startup by .Pa /etc/rc.d/zfs . For more information, see variable @@ -2467,7 +2430,7 @@ file systems that have the .Sy sharenfs property set. This command may be executed on -.Fx +.Nx system startup by .Pa /etc/rc.d/zfs . For more information, see variable @@ -2500,7 +2463,7 @@ file systems that have the .Sy sharenfs property set. This command may be executed on -.Fx +.Nx system shutdown by .Pa /etc/rc.d/zfs . For more information, see variable @@ -3034,7 +2997,6 @@ protocol .It exec Ta property .It filesystem_limit Ta
CVS commit: src/share/man/man5
Module Name:src Committed By: christos Date: Fri Apr 30 16:12:19 UTC 2021 Modified Files: src/share/man/man5: resolv.conf.5 Log Message: Mention that check-names is now the default. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/share/man/man5/resolv.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/resolv.conf.5 diff -u src/share/man/man5/resolv.conf.5:1.30 src/share/man/man5/resolv.conf.5:1.31 --- src/share/man/man5/resolv.conf.5:1.30 Sun Sep 9 14:09:24 2012 +++ src/share/man/man5/resolv.conf.5 Fri Apr 30 12:12:18 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: resolv.conf.5,v 1.30 2012/09/09 18:09:24 christos Exp $ +.\" $NetBSD: resolv.conf.5,v 1.31 2021/04/30 16:12:18 christos Exp $ .\" .\" Copyright (c) 1986, 1991 The Regents of the University of California. .\" All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)resolver.5 5.12 (Berkeley) 5/10/91 .\" -.Dd September 9, 2012 +.Dd Arril 30, 2021 .Dt RESOLV.CONF 5 .Os .Sh NAME @@ -179,7 +179,6 @@ which disables the modern BIND checking for invalid characters such as underscore .Pq Sq _ , non-ASCII, or control characters. -This is the default. .It Sy check-names clears .Dv RES_NOCHECKNAME @@ -187,6 +186,7 @@ in .Ft _res.options , which enables the modern BIND checking of incoming host names and mail names as described above. +This is the default. .It Sy edns0 attach OPT pseudo-RR for ENDS0 extension specified in RFC 2671, to inform DNS server of our receive buffer size.
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Fri Apr 30 16:07:49 UTC 2021
Modified Files:
src/include: resolv.h
Log Message:
Default to check-names for safety.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/include/resolv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/resolv.h
diff -u src/include/resolv.h:1.40 src/include/resolv.h:1.41
--- src/include/resolv.h:1.40 Wed Nov 7 10:45:24 2012
+++ src/include/resolv.h Fri Apr 30 12:07:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: resolv.h,v 1.40 2012/11/07 15:45:24 christos Exp $ */
+/* $NetBSD: resolv.h,v 1.41 2021/04/30 16:07:49 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -257,7 +257,7 @@ union res_sockaddr_union {
#define RES_NO_NIBBLE2 0x8000 /*%< disable alternate nibble lookup */
#define RES_DEFAULT (RES_RECURSE | RES_DEFNAMES | \
- RES_DNSRCH | RES_NO_NIBBLE2 | RES_NOCHECKNAME)
+ RES_DNSRCH | RES_NO_NIBBLE2)
/*%
* Resolver "pfcode" values. Used by dig.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: christos Date: Fri Apr 30 15:37:06 UTC 2021 Added Files: src/sys/arch/x86/include: gdt.h Log Message: merge the i386 and amd64 gdt.h files. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/include/gdt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/x86/include/gdt.h diff -u /dev/null src/sys/arch/x86/include/gdt.h:1.1 --- /dev/null Fri Apr 30 11:37:06 2021 +++ src/sys/arch/x86/include/gdt.h Fri Apr 30 11:37:05 2021 @@ -0,0 +1,67 @@ +/* $NetBSD: gdt.h,v 1.1 2021/04/30 15:37:05 christos Exp $ */ + +/*- + * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by John T. Kohl and Charles M. Hannum. + * + * 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. + */ + +#ifndef _X86_GDT_H_ +#define _X86_GDT_H_ + +#if !defined(_LOCORE) + +struct cpu_info; +void gdt_init(void); +void gdt_init_cpu(struct cpu_info *); +void gdt_alloc_cpu(struct cpu_info *); + +#ifdef _LP64 +struct x86_64_tss; +int tss_alloc(struct x86_64_tss *); +#else +struct i386tss; +int tss_alloc(const struct i386tss *); +#endif + +void tss_free(int); +int ldt_alloc(void *, size_t); +void ldt_free(int); + +#endif /* LOCORE */ + + +#ifndef MAXGDTSIZ +# define MAXGDTSIZ 65536 /* XXX: see */ +#endif + +#ifndef MAX_USERLDT_SIZE +# define MAX_USERLDT_SIZE 65536 /* XXX: see */ +#endif + +#define MAX_USERLDT_SLOTS (int)(MAX_USERLDT_SIZE / sizeof(union descriptor)) + +#endif /* _X86_GDT_H_ */
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Apr 30 14:28:36 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1674 - #1676 To generate a diff of this commit: cvs rdiff -u -r1.1.2.85 -r1.1.2.86 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.85 src/doc/CHANGES-8.3:1.1.2.86 --- src/doc/CHANGES-8.3:1.1.2.85 Tue Apr 27 19:03:02 2021 +++ src/doc/CHANGES-8.3 Fri Apr 30 14:28:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.85 2021/04/27 19:03:02 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.86 2021/04/30 14:28:35 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1858,3 +1858,38 @@ xsrc/external/mit/xorg-server.old/dist/X Fix CVE-2021-3472 (local privilege escalation). [mrg, ticket #1673] + +distrib/notes/common/netboot 1.39 + + For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory. + [tsutsui, ticket #1674] + +sys/arch/xen/x86/xen_ipi.c 1.24 (patch) + + PR 50282: fix build for XEN kernels without DDB. + [kre, ticket #1675] + +external/public-domain/tz/dist/Makefile up to 1.1.1.30 +external/public-domain/tz/dist/NEWS up to 1.1.1.34 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.24 +external/public-domain/tz/dist/africa up to 1.1.1.25 +external/public-domain/tz/dist/asia up to 1.1.1.28 +external/public-domain/tz/dist/australasia up to 1.1.1.21 +external/public-domain/tz/dist/backward up to 1.1.1.12 +external/public-domain/tz/dist/backzone up to 1.1.1.20 +external/public-domain/tz/dist/etcetera up to 1.1.1.5 +external/public-domain/tz/dist/europe up to 1.1.1.30 +external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15 +external/public-domain/tz/dist/leapseconds up to 1.1.1.18 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.12 +external/public-domain/tz/dist/northamerica up to 1.1.1.27 +external/public-domain/tz/dist/theory.html up to 1.1.1.12 +external/public-domain/tz/dist/version up to 1.1.1.21 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.6 +external/public-domain/tz/dist/zone.tab up to 1.1.1.19 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.21 +doc/3RDPARTY (apply patch) + + Update tzdata to 2021a. + [kre, ticket #1676] +
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Fri Apr 30 14:26:39 UTC 2021 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS TZDATA_VERSION africa asia australasia backward backzone etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica theory.html version ziguard.awk zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #1676: external/public-domain/tz/dist/Makefile up to 1.1.1.30 external/public-domain/tz/dist/NEWS up to 1.1.1.34 external/public-domain/tz/dist/TZDATA_VERSION up to 1.24 external/public-domain/tz/dist/africa up to 1.1.1.25 external/public-domain/tz/dist/asia up to 1.1.1.28 external/public-domain/tz/dist/australasia up to 1.1.1.21 external/public-domain/tz/dist/backward up to 1.1.1.12 external/public-domain/tz/dist/backzone up to 1.1.1.20 external/public-domain/tz/dist/etcetera up to 1.1.1.5 external/public-domain/tz/dist/europe up to 1.1.1.30 external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15 external/public-domain/tz/dist/leapseconds up to 1.1.1.18 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.12 external/public-domain/tz/dist/northamerica up to 1.1.1.27 external/public-domain/tz/dist/theory.html up to 1.1.1.12 external/public-domain/tz/dist/version up to 1.1.1.21 external/public-domain/tz/dist/ziguard.awk up to 1.1.1.6 external/public-domain/tz/dist/zone.tab up to 1.1.1.19 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.21 doc/3RDPARTY(apply patch) Update from tzdata2020d to tzdata2021a. The significant changes are: Volgograd switched to Moscow time on 2020-12-27 at 02:00. (2020e) South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. (2021a) To generate a diff of this commit: cvs rdiff -u -r1.1444.2.25 -r1.1444.2.26 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.17.4.7 -r1.1.1.17.4.8 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.18.4.8 -r1.1.1.18.4.9 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.8.4.8 -r1.8.4.9 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.11.4.8 -r1.1.1.11.4.9 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.16.4.7 -r1.1.1.16.4.8 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.7.4.3 -r1.1.1.7.4.4 \ src/external/public-domain/tz/dist/backward cvs rdiff -u -r1.1.1.11.4.5 -r1.1.1.11.4.6 \ src/external/public-domain/tz/dist/backzone cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.7.4.4 -r1.1.1.7.4.5 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.8.4.5 -r1.1.1.8.4.6 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.1.2.9 -r1.1.1.1.2.10 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.5.4.8 -r1.1.1.5.4.9 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \ src/external/public-domain/tz/dist/ziguard.awk cvs rdiff -u -r1.1.1.11.4.6 -r1.1.1.11.4.7 \ src/external/public-domain/tz/dist/zone.tab cvs rdiff -u -r1.1.1.13.4.6 -r1.1.1.13.4.7 \ src/external/public-domain/tz/dist/zone1970.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1444.2.25 src/doc/3RDPARTY:1.1444.2.26 --- src/doc/3RDPARTY:1.1444.2.25 Sat Dec 19 13:41:22 2020 +++ src/doc/3RDPARTY Fri Apr 30 14:26:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1444.2.25 2020/12/19 13:41:22 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1444.2.26 2021/04/30 14:26:38 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1411,8 +1411,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2017b / tzdata2020d -Current Vers: tzcode2020d / tzdata2020d +Version: tzcode2017b / tzdata2021a +Current Vers: tzcode2021a / tzdata2021a Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.7
CVS commit: [netbsd-8] src/sys/arch/xen/x86
Module Name:src
Committed By: martin
Date: Fri Apr 30 14:22:24 UTC 2021
Modified Files:
src/sys/arch/xen/x86 [netbsd-8]: xen_ipi.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1675):
sys/arch/xen/x86/xen_ipi.c: revision 1.24 (patch)
make compile without DDB
PR port-xen/50282
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 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.20 src/sys/arch/xen/x86/xen_ipi.c:1.20.10.1
--- src/sys/arch/xen/x86/xen_ipi.c:1.20 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/xen/x86/xen_ipi.c Fri Apr 30 14:22:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,12 @@
/*
* Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $");
+
+#include "opt_ddb.h"
#include
@@ -59,15 +61,17 @@ __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v
#include
#include
+#ifdef DDB
#ifdef __x86_64__
extern void ddb_ipi(struct trapframe);
#else
extern void ddb_ipi(int, struct trapframe);
#endif /* __x86_64__ */
+static void xen_ipi_ddb(struct cpu_info *, struct intrframe *);
+#endif
static void xen_ipi_halt(struct cpu_info *, struct intrframe *);
static void xen_ipi_synch_fpu(struct cpu_info *, struct intrframe *);
-static void xen_ipi_ddb(struct cpu_info *, struct intrframe *);
static void xen_ipi_xcall(struct cpu_info *, struct intrframe *);
static void xen_ipi_hvcb(struct cpu_info *, struct intrframe *);
static void xen_ipi_generic(struct cpu_info *, struct intrframe *);
@@ -76,7 +80,11 @@ static void (*ipifunc[XEN_NIPIS])(struct
{ /* In order of priority (see: xen/include/intrdefs.h */
xen_ipi_halt,
xen_ipi_synch_fpu,
+#ifdef DDB
xen_ipi_ddb,
+#else
+ NULL,
+#endif
xen_ipi_xcall,
xen_ipi_hvcb,
xen_ipi_generic,
@@ -226,6 +234,7 @@ xen_ipi_synch_fpu(struct cpu_info *ci, s
fpusave_cpu(true);
}
+#ifdef DDB
static void
xen_ipi_ddb(struct cpu_info *ci, struct intrframe *intrf)
{
@@ -264,6 +273,7 @@ xen_ipi_ddb(struct cpu_info *ci, struct
ddb_ipi(SEL_KPL, tf);
#endif
}
+#endif /* DDB */
static void
xen_ipi_xcall(struct cpu_info *ci, struct intrframe *intrf)
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Apr 30 14:08:16 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1260 - #1263 To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.2 diff -u src/doc/CHANGES-9.2:1.1.2.74 src/doc/CHANGES-9.2:1.1.2.75 --- src/doc/CHANGES-9.2:1.1.2.74 Wed Apr 28 09:59:33 2021 +++ src/doc/CHANGES-9.2 Fri Apr 30 14:08:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.74 2021/04/28 09:59:33 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.75 2021/04/30 14:08:16 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -3022,3 +3022,37 @@ bin/sh/jobs.h 1.24 background jobs. [kre, ticket #1259] +distrib/sets/lists/man/mi 1.1718 (patch) +share/man/man4/man4.evbarm/Makefile 1.12 (patch) +share/man/man4/man4.evbarm/sun8icrypto.4 1.1 + + sun8icrypto(4): add a man page. + [nia, ticket #1260] + +common/lib/libc/arch/arm/atomic/atomic_swap.S 1.17 +common/lib/libc/arch/arm/atomic/atomic_swap_16.S 1.5 +common/lib/libc/arch/arm/atomic/atomic_swap_64.S 1.12 +common/lib/libc/arch/arm/atomic/membar_ops.S 1.7 +sys/arch/arm/include/lock.h 1.38 + + ARM lock and atomic fixes. + [skrll, ticket #1261] + +distrib/notes/common/netboot 1.39 + + For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory. + [tsutsui, ticket #1262] + +bin/pax/extern.h1.60 +bin/pax/options.c1.119 +sbin/newfs_udf/newfs_udf.h 1.7 (patch) +sbin/newfs_udf/udf_create.c 1.27 (patch) +usr.bin/config/defs.h1.106 +usr.bin/config/main.c1.100 +usr.bin/config/scan.l1.32 +usr.bin/make/main.c1.274 +usr.bin/make/make.h1.105 + + Avoid depending on common symbols. + [mrg, ticket #1263] +
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Fri Apr 30 14:07:02 UTC 2021
Modified Files:
src/bin/pax [netbsd-9]: extern.h options.c
src/sbin/newfs_udf [netbsd-9]: newfs_udf.h udf_create.c
src/usr.bin/config [netbsd-9]: defs.h main.c scan.l
src/usr.bin/make [netbsd-9]: main.c make.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1263):
bin/pax/options.c: revision 1.119
usr.bin/config/scan.l: revision 1.32
usr.bin/make/main.c: revision 1.274
bin/pax/extern.h: revision 1.60
usr.bin/config/defs.h: revision 1.106
usr.bin/make/make.h: revision 1.105
sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
usr.bin/config/main.c: revision 1.100
Avoid depending on common symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.36.1 src/bin/pax/extern.h
cvs rdiff -u -r1.118 -r1.118.18.1 src/bin/pax/options.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sbin/newfs_udf/newfs_udf.h
cvs rdiff -u -r1.26 -r1.26.2.1 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.104.2.1 -r1.104.2.2 src/usr.bin/config/defs.h
cvs rdiff -u -r1.98.2.1 -r1.98.2.2 src/usr.bin/config/main.c
cvs rdiff -u -r1.26.16.2 -r1.26.16.3 src/usr.bin/config/scan.l
cvs rdiff -u -r1.273 -r1.273.6.1 src/usr.bin/make/main.c
cvs rdiff -u -r1.104 -r1.104.6.1 src/usr.bin/make/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/extern.h
diff -u src/bin/pax/extern.h:1.59 src/bin/pax/extern.h:1.59.36.1
--- src/bin/pax/extern.h:1.59 Thu Aug 9 08:09:21 2012
+++ src/bin/pax/extern.h Fri Apr 30 14:07:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.59 2012/08/09 08:09:21 christos Exp $ */
+/* $NetBSD: extern.h,v 1.59.36.1 2021/04/30 14:07:02 martin Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -204,9 +204,8 @@ void options(int, char **);
OPLIST * opt_next(void);
int bad_opt(void);
int mkpath(char *);
-char *chdname;
#if !HAVE_NBTOOL_CONFIG_H
-int do_chroot;
+extern int do_chroot;
#endif
/*
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.118 src/bin/pax/options.c:1.118.18.1
--- src/bin/pax/options.c:1.118 Sat Dec 19 18:45:52 2015
+++ src/bin/pax/options.c Fri Apr 30 14:07:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $ */
+/* $NetBSD: options.c,v 1.118.18.1 2021/04/30 14:07:02 martin Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.118.18.1 2021/04/30 14:07:02 martin Exp $");
#endif
#endif /* not lint */
@@ -74,6 +74,11 @@ __RCSID("$NetBSD: options.c,v 1.118 2015
#include "mtree.h"
#endif /* SMALL */
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
/*
* Routines which handle command line options
*/
Index: src/sbin/newfs_udf/newfs_udf.h
diff -u src/sbin/newfs_udf/newfs_udf.h:1.6 src/sbin/newfs_udf/newfs_udf.h:1.6.2.1
--- src/sbin/newfs_udf/newfs_udf.h:1.6 Sun Jun 30 11:38:16 2019
+++ src/sbin/newfs_udf/newfs_udf.h Fri Apr 30 14:07:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_udf.h,v 1.6 2019/06/30 11:38:16 sevan Exp $ */
+/* $NetBSD: newfs_udf.h,v 1.6.2.1 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -54,10 +54,6 @@ extern int meta_perc;
extern float meta_fract;
-/* shared structure between udf_create.c users */
-struct udf_create_context context;
-struct udf_disclayout layout;
-
/* prototypes */
int udf_write_sector(void *sector, uint64_t location);
int udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti);
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.26 src/sbin/newfs_udf/udf_create.c:1.26.2.1
--- src/sbin/newfs_udf/udf_create.c:1.26 Sun Dec 9 17:52:48 2018
+++ src/sbin/newfs_udf/udf_create.c Fri Apr 30 14:07:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $ */
+/* $NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: udf_create.c,v 1.26 2018/12/09 17:52:48 christos Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.26.2.1 2021/04/30 14:07:02 martin Exp $");
#include
#include
@@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.26 20
# endif
#endif
+/* shared structure between udf_create.c users */
+struct udf_create_context context;
+struct udf_disclayout layout;
+
/*
* NOTE that there is some overlap between this code and the udf kernel fs.
* This is intentially though it might better be factored out one day.
Index: src/usr.bin/config/defs.h
diff -u
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Fri Apr 30 13:59:23 UTC 2021
Modified Files:
src/distrib/notes/common [netbsd-8]: netboot
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1674):
distrib/notes/common/netboot: revision 1.39
For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory.
Pointed out by Anders Gustafsson on port-hp300@.
https://mail-index.netbsd.org/port-hp300/2021/04/21/msg000201.html
Should be pulled up to netbsd-8 and netbsd-9.
XXX: kernel should use the dhcpd/bootp server address for nfsroot
if the specified next-server (siaddr) is 0.0.0.0?
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.8.1 src/distrib/notes/common/netboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/netboot
diff -u src/distrib/notes/common/netboot:1.36 src/distrib/notes/common/netboot:1.36.8.1
--- src/distrib/notes/common/netboot:1.36 Tue May 19 19:30:27 2015
+++ src/distrib/notes/common/netboot Fri Apr 30 13:59:23 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: netboot,v 1.36 2015/05/19 19:30:27 snj Exp $
+.\" $NetBSD: netboot,v 1.36.8.1 2021/04/30 13:59:23 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -345,16 +345,15 @@ group {
.\}
#
-# If your DHCP server is not your NFS server, supply the
-# address of the NFS server. Since we assume you run everything
-# on one server, this is not needed.
+# The host address of the NFS server. This is mandatory for
+# NetBSD kernels even it's the same host as the DHCP server.
.if \n[macppc] \{\
#
# macppc machines will look for their bootloader,
# ofwboot.xcf, on the next-server as well.
.\}
#
-# next-server server.test.net;
+next-server server.test.net;
}
#you may paste another "host" entry here for additional
#clients on this network
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Fri Apr 30 13:57:00 UTC 2021
Modified Files:
src/distrib/notes/common [netbsd-9]: netboot
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1262):
distrib/notes/common/netboot: revision 1.39
For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory.
Pointed out by Anders Gustafsson on port-hp300@.
https://mail-index.netbsd.org/port-hp300/2021/04/21/msg000201.html
Should be pulled up to netbsd-8 and netbsd-9.
XXX: kernel should use the dhcpd/bootp server address for nfsroot
if the specified next-server (siaddr) is 0.0.0.0?
To generate a diff of this commit:
cvs rdiff -u -r1.36.18.2 -r1.36.18.3 src/distrib/notes/common/netboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/netboot
diff -u src/distrib/notes/common/netboot:1.36.18.2 src/distrib/notes/common/netboot:1.36.18.3
--- src/distrib/notes/common/netboot:1.36.18.2 Wed Nov 27 13:36:55 2019
+++ src/distrib/notes/common/netboot Fri Apr 30 13:57:00 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: netboot,v 1.36.18.2 2019/11/27 13:36:55 msaitoh Exp $
+.\" $NetBSD: netboot,v 1.36.18.3 2021/04/30 13:57:00 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -345,16 +345,15 @@ group {
.\}
#
-# If your DHCP server is not your NFS server, supply the
-# address of the NFS server. Since we assume you run everything
-# on one server, this is not needed.
+# The host address of the NFS server. This is mandatory for
+# NetBSD kernels even it's the same host as the DHCP server.
.if \n[macppc] \{\
#
# macppc machines will look for their bootloader,
# ofwboot.xcf, on the next-server as well.
.\}
#
-# next-server server.test.net;
+next-server server.test.net;
}
#you may paste another "host" entry here for additional
#clients on this network
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Apr 30 13:55:18 UTC 2021 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 Log Message: Add (we could gc now the files if we fix the sources that use them. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.201 -r1.202 src/distrib/sets/lists/comp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.285 src/distrib/sets/lists/comp/md.amd64:1.286 --- src/distrib/sets/lists/comp/md.amd64:1.285 Sun Apr 11 22:08:59 2021 +++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 30 09:55:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.285 2021/04/12 02:08:59 mrg Exp $ +# $NetBSD: md.amd64,v 1.286 2021/04/30 13:55:18 christos Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -1144,6 +1144,7 @@ ./usr/include/x86/dbregs.h comp-obsolete obsolete ./usr/include/x86/float.h comp-c-include ./usr/include/x86/fpu.hcomp-c-include +./usr/include/x86/gdt.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include Index: src/distrib/sets/lists/comp/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.201 src/distrib/sets/lists/comp/md.i386:1.202 --- src/distrib/sets/lists/comp/md.i386:1.201 Sun Apr 11 22:09:00 2021 +++ src/distrib/sets/lists/comp/md.i386 Fri Apr 30 09:55:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.201 2021/04/12 02:09:00 mrg Exp $ +# $NetBSD: md.i386,v 1.202 2021/04/30 13:55:18 christos Exp $ ./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete ./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete ./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete @@ -1017,6 +1017,7 @@ ./usr/include/x86/dbregs.h comp-obsolete obsolete ./usr/include/x86/float.h comp-c-include ./usr/include/x86/fpu.hcomp-c-include +./usr/include/x86/gdt.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include
CVS commit: src/sys/arch
Module Name:src
Committed By: christos
Date: Fri Apr 30 13:54:26 UTC 2021
Modified Files:
src/sys/arch/amd64/include: gdt.h
src/sys/arch/i386/i386: gdt.c
src/sys/arch/i386/include: gdt.h
src/sys/arch/x86/include: Makefile pmap.h
Log Message:
Merge the x86 gdt function and constant definitions
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/gdt.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/i386/gdt.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/include/gdt.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/include/Makefile
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/x86/include/pmap.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/amd64/include/gdt.h
diff -u src/sys/arch/amd64/include/gdt.h:1.13 src/sys/arch/amd64/include/gdt.h:1.14
--- src/sys/arch/amd64/include/gdt.h:1.13 Thu Apr 29 21:09:29 2021
+++ src/sys/arch/amd64/include/gdt.h Fri Apr 30 09:54:26 2021
@@ -1,50 +1,3 @@
-/* $NetBSD: gdt.h,v 1.13 2021/04/30 01:09:29 christos Exp $ */
+/* $NetBSD: gdt.h,v 1.14 2021/04/30 13:54:26 christos Exp $ */
-/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by John T. Kohl and Charles M. Hannum.
- *
- * 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.
- */
-
-#ifndef _LOCORE
-struct proc;
-struct pmap;
-
-void gdt_init(void);
-void gdt_init_cpu(struct cpu_info *);
-void gdt_alloc_cpu(struct cpu_info *);
-
-struct x86_64_tss;
-int tss_alloc(struct x86_64_tss *);
-void tss_free(int);
-
-int ldt_alloc(void *, size_t);
-void ldt_free(int);
-#endif
-
-#define MAXGDTSIZ 65536 /* XXX: see */
-#define MAX_USERLDT_SIZE 65536 /* XXX: see */
-#define MAX_USERLDT_SLOTS (int)(MAX_USERLDT_SIZE / sizeof(union descriptor))
+#include
Index: src/sys/arch/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.71 src/sys/arch/i386/i386/gdt.c:1.72
--- src/sys/arch/i386/i386/gdt.c:1.71 Wed Oct 30 03:40:05 2019
+++ src/sys/arch/i386/i386/gdt.c Fri Apr 30 09:54:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gdt.c,v 1.71 2019/10/30 07:40:05 maxv Exp $ */
+/* $NetBSD: gdt.c,v 1.72 2021/04/30 13:54:26 christos Exp $ */
/*
* Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.71 2019/10/30 07:40:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.72 2021/04/30 13:54:26 christos Exp $");
#include "opt_multiprocessor.h"
#include "opt_xen.h"
@@ -279,7 +279,7 @@ tss_free(int sel)
}
int
-ldt_alloc(union descriptor *ldtp, size_t len)
+ldt_alloc(void *ldtp, size_t len)
{
int slot;
Index: src/sys/arch/i386/include/gdt.h
diff -u src/sys/arch/i386/include/gdt.h:1.19 src/sys/arch/i386/include/gdt.h:1.20
--- src/sys/arch/i386/include/gdt.h:1.19 Thu Apr 29 21:09:29 2021
+++ src/sys/arch/i386/include/gdt.h Fri Apr 30 09:54:26 2021
@@ -1,49 +1,3 @@
-/* $NetBSD: gdt.h,v 1.19 2021/04/30 01:09:29 christos Exp $ */
+/* $NetBSD: gdt.h,v 1.20 2021/04/30 13:54:26 christos Exp $ */
-/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by John T. Kohl and Charles M. Hannum.
- *
- * 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
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Fri Apr 30 13:54:00 UTC 2021
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-9]: atomic_swap.S
atomic_swap_16.S atomic_swap_64.S membar_ops.S
src/sys/arch/arm/include [netbsd-9]: lock.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1261):
sys/arch/arm/include/lock.h: revision 1.38
common/lib/libc/arch/arm/atomic/membar_ops.S: revision 1.7
common/lib/libc/arch/arm/atomic/atomic_swap_16.S: revision 1.5
common/lib/libc/arch/arm/atomic/atomic_swap_64.S: revision 1.12
common/lib/libc/arch/arm/atomic/atomic_swap.S: revision 1.17
Add the appropriate memory barrier before the lock is cleared in
__sync_lock_release_{1,2,4,8}. That is, all reads and write for the
inner shareability domain before the lock clear store.
Improve the membar_ops barriers - no need to use dsb and wait for
completion. Also, we only to act on the inner shareability domain.
Fix the barrier confusion. From Riastradh - thanks!.
To generate a diff of this commit:
cvs rdiff -u -r1.14.18.1 -r1.14.18.2 \
src/common/lib/libc/arch/arm/atomic/atomic_swap.S
cvs rdiff -u -r1.4 -r1.4.18.1 \
src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S
cvs rdiff -u -r1.10.18.1 -r1.10.18.2 \
src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
cvs rdiff -u -r1.6 -r1.6.28.1 \
src/common/lib/libc/arch/arm/atomic/membar_ops.S
cvs rdiff -u -r1.33.8.1 -r1.33.8.2 src/sys/arch/arm/include/lock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14.18.1 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14.18.2
--- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14.18.1 Mon Apr 26 18:34:28 2021
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Fri Apr 30 13:54:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.14.18.1 2021/04/26 18:34:28 martin Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.14.18.2 2021/04/30 13:54:00 martin Exp $ */
/*-
* Copyright (c) 2007,2012 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@ STRONG_ALIAS(_atomic_swap_ptr,_atomic_sw
ENTRY_NP(__sync_lock_release_4)
mov r1, #0
#ifdef _ARM_ARCH_7
- dmb
+ dmb ishst
#else
mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */
#endif
@@ -129,7 +129,7 @@ STRONG_ALIAS(_atomic_swap_uchar,_atomic_
ENTRY_NP(__sync_lock_release_1)
mov r1, #0
#ifdef _ARM_ARCH_7
- dmb
+ dmb ishst
#else
mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */
#endif
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.4 src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.4.18.1
--- src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S Fri Apr 30 13:54:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_16.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: atomic_swap_16.S,v 1.4.18.1 2021/04/30 13:54:00 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -58,6 +58,11 @@ STRONG_ALIAS(_atomic_swap_ushort,_atomic
#if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE)
ENTRY_NP(__sync_lock_release_2)
mov r1, #0
+#ifdef _ARM_ARCH_7
+ dmb ishst
+#else
+ mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */
+#endif
strh r1, [r0]
RET
END(__sync_lock_release_2)
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10.18.1 src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10.18.2
--- src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10.18.1 Mon Apr 26 18:34:28 2021
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S Fri Apr 30 13:54:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_64.S,v 1.10.18.1 2021/04/26 18:34:28 martin Exp $ */
+/* $NetBSD: atomic_swap_64.S,v 1.10.18.2 2021/04/30 13:54:00 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -57,6 +57,11 @@ CRT_ALIAS(__atomic_exchange_8,_atomic_sw
ENTRY_NP(__sync_lock_release_8)
mov r2, #0
mov r3, #0
+#ifdef _ARM_ARCH_7
+ dmb ishst
+#else
+ mcr p15, 0, r2, c7, c10, 5 /* data memory barrier */
+#endif
strd r2, r3, [r0]
RET
END(__sync_lock_release_8)
Index: src/common/lib/libc/arch/arm/atomic/membar_ops.S
diff -u src/common/lib/libc/arch/arm/atomic/membar_ops.S:1.6 src/common/lib/libc/arch/arm/atomic/membar_ops.S:1.6.28.1
--- src/common/lib/libc/arch/arm/atomic/membar_ops.S:1.6 Fri Mar 28 21:32:41 2014
+++ src/common/lib/libc/arch/arm/atomic/membar_ops.S Fri Apr 30 13:54:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: membar_ops.S,v 1.6 2014/03/28 21:32:41 skrll Exp $ */
+/* $NetBSD: membar_ops.S,v 1.6.28.1 2021/04/30 13:54:00 martin Exp $ */
/*-
*
CVS commit: src/tests/lib/libi386
Module Name:src Committed By: christos Date: Fri Apr 30 13:53:30 UTC 2021 Modified Files: src/tests/lib/libi386: t_user_ldt.c Log Message: remove hacks. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libi386/t_user_ldt.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/libi386/t_user_ldt.c diff -u src/tests/lib/libi386/t_user_ldt.c:1.5 src/tests/lib/libi386/t_user_ldt.c:1.6 --- src/tests/lib/libi386/t_user_ldt.c:1.5 Sun Jul 19 10:31:31 2020 +++ src/tests/lib/libi386/t_user_ldt.c Fri Apr 30 09:53:30 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: t_user_ldt.c,v 1.5 2020/07/19 14:31:31 maxv Exp $ */ +/* $NetBSD: t_user_ldt.c,v 1.6 2021/04/30 13:53:30 christos Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -41,10 +41,7 @@ #include #include #include - -#define _LOCORE /* XXX a bit of a hack, but whatever */ #include -#undef _LOCORE #include
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Fri Apr 30 13:49:55 UTC 2021 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4/man4.evbarm [netbsd-9]: Makefile Added Files: src/share/man/man4/man4.evbarm [netbsd-9]: sun8icrypto.4 Log Message: Pull up following revision(s) (requested by nia in ticket #1260): distrib/sets/lists/man/mi: revision 1.1718 (patch) share/man/man4/man4.evbarm/sun8icrypto.4: revision 1.1 share/man/man4/man4.evbarm/Makefile: revision 1.12 (patch) add a man page for sun8icrypto(4) To generate a diff of this commit: cvs rdiff -u -r1.1649.2.7 -r1.1649.2.8 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.9 -r1.9.2.1 src/share/man/man4/man4.evbarm/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/man4.evbarm/sun8icrypto.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1649.2.7 src/distrib/sets/lists/man/mi:1.1649.2.8 --- src/distrib/sets/lists/man/mi:1.1649.2.7 Tue Jul 7 10:29:06 2020 +++ src/distrib/sets/lists/man/mi Fri Apr 30 13:49:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1649.2.7 2020/07/07 10:29:06 martin Exp $ +# $NetBSD: mi,v 1.1649.2.8 2021/04/30 13:49:55 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1090,6 +1090,7 @@ ./usr/share/man/cat4/evbarm/iopaau.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/iopwdog.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/rktsadc.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/sun8icrypto.0 man-sys-catman .cat ./usr/share/man/cat4/evbmips/aupci.0 man-sys-catman .cat ./usr/share/man/cat4/evbmips/intro.0 man-sys-catman .cat ./usr/share/man/cat4/evbppc/cpc.0 man-sys-catman .cat @@ -4267,6 +4268,7 @@ ./usr/share/man/html4/evbarm/iopaau.html man-sys-htmlman html ./usr/share/man/html4/evbarm/iopwdog.html man-sys-htmlman html ./usr/share/man/html4/evbarm/rktsadc.html man-sys-htmlman html +./usr/share/man/html4/evbarm/sun8icrypto.html man-sys-htmlman html ./usr/share/man/html4/evbmips/aupci.html man-sys-htmlman html ./usr/share/man/html4/evbmips/intro.html man-sys-htmlman html ./usr/share/man/html4/evbppc/cpc.html man-sys-htmlman html @@ -7216,6 +7218,7 @@ ./usr/share/man/man4/evbarm/iopaau.4 man-sys-man .man ./usr/share/man/man4/evbarm/iopwdog.4 man-sys-man .man ./usr/share/man/man4/evbarm/rktsadc.4 man-sys-man .man +./usr/share/man/man4/evbarm/sun8icrypto.4 man-sys-man .man ./usr/share/man/man4/evbmips/aupci.4 man-sys-man .man ./usr/share/man/man4/evbmips/intro.4 man-sys-man .man ./usr/share/man/man4/evbppc/cpc.4 man-sys-man .man Index: src/share/man/man4/man4.evbarm/Makefile diff -u src/share/man/man4/man4.evbarm/Makefile:1.9 src/share/man/man4/man4.evbarm/Makefile:1.9.2.1 --- src/share/man/man4/man4.evbarm/Makefile:1.9 Thu Jun 6 05:32:29 2019 +++ src/share/man/man4/man4.evbarm/Makefile Fri Apr 30 13:49:55 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2019/06/06 05:32:29 mrg Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2021/04/30 13:49:55 martin Exp $ MAN= awge.4 bcmgpio.4 cpsw.4 epgpio.4 gxio.4 intro.4 iopaau.4 iopwdog.4 \ - rktsadc.4 + rktsadc.4 sun8icrypto.4 MANSUBDIR=/evbarm Added files: Index: src/share/man/man4/man4.evbarm/sun8icrypto.4 diff -u /dev/null src/share/man/man4/man4.evbarm/sun8icrypto.4:1.2.2.2 --- /dev/null Fri Apr 30 13:49:56 2021 +++ src/share/man/man4/man4.evbarm/sun8icrypto.4 Fri Apr 30 13:49:55 2021 @@ -0,0 +1,109 @@ +.\" $NetBSD: sun8icrypto.4,v 1.2.2.2 2021/04/30 13:49:55 martin Exp $ +.\" +.\" Copyright (c) 2021 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" 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
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Apr 30 06:55:32 UTC 2021 Modified Files: src/sys/dev/pci/ixgbe: if_bypass.c if_fdir.c if_sriov.c ix_txrx.c ixgbe.c ixgbe_82598.c ixgbe_82599.c ixgbe_api.c ixgbe_common.c ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c ixgbe_mbx.c ixgbe_netbsd.c ixgbe_netmap.c ixgbe_osdep.c ixgbe_phy.c ixgbe_vf.c ixgbe_x540.c ixgbe_x550.c ixv.c Log Message: Add missing __KERNEL_RCSID(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/ixgbe/if_bypass.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/if_fdir.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/if_sriov.c \ src/sys/dev/pci/ixgbe/ixgbe_dcb.c cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.280 -r1.281 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ixgbe_82598.c \ src/sys/dev/pci/ixgbe/ixgbe_netbsd.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/ixgbe/ixgbe_82599.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/ixgbe/ixgbe_api.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/ixgbe/ixgbe_common.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c \ src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_mbx.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/ixgbe_netmap.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ixgbe/ixgbe_osdep.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/ixgbe/ixgbe_phy.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/ixgbe/ixgbe_vf.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe_x540.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_x550.c cvs rdiff -u -r1.158 -r1.159 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/if_bypass.c diff -u src/sys/dev/pci/ixgbe/if_bypass.c:1.7 src/sys/dev/pci/ixgbe/if_bypass.c:1.8 --- src/sys/dev/pci/ixgbe/if_bypass.c:1.7 Fri Apr 30 06:41:36 2021 +++ src/sys/dev/pci/ixgbe/if_bypass.c Fri Apr 30 06:55:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bypass.c,v 1.7 2021/04/30 06:41:36 msaitoh Exp $ */ +/* $NetBSD: if_bypass.c,v 1.8 2021/04/30 06:55:32 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation @@ -33,6 +33,8 @@ **/ /*$FreeBSD: head/sys/dev/ixgbe/if_bypass.c 327031 2017-12-20 18:15:06Z erj $*/ +#include +__KERNEL_RCSID(0, "$NetBSD: if_bypass.c,v 1.8 2021/04/30 06:55:32 msaitoh Exp $"); #include "ixgbe.h" Index: src/sys/dev/pci/ixgbe/if_fdir.c diff -u src/sys/dev/pci/ixgbe/if_fdir.c:1.4 src/sys/dev/pci/ixgbe/if_fdir.c:1.5 --- src/sys/dev/pci/ixgbe/if_fdir.c:1.4 Fri Apr 30 06:41:36 2021 +++ src/sys/dev/pci/ixgbe/if_fdir.c Fri Apr 30 06:55:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_fdir.c,v 1.4 2021/04/30 06:41:36 msaitoh Exp $ */ +/* $NetBSD: if_fdir.c,v 1.5 2021/04/30 06:55:32 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation @@ -33,6 +33,9 @@ **/ /*$FreeBSD: head/sys/dev/ixgbe/if_fdir.c 327031 2017-12-20 18:15:06Z erj $*/ +#include +__KERNEL_RCSID(0, "$NetBSD: if_fdir.c,v 1.5 2021/04/30 06:55:32 msaitoh Exp $"); + #include "ixgbe.h" #ifdef IXGBE_FDIR Index: src/sys/dev/pci/ixgbe/if_sriov.c diff -u src/sys/dev/pci/ixgbe/if_sriov.c:1.10 src/sys/dev/pci/ixgbe/if_sriov.c:1.11 --- src/sys/dev/pci/ixgbe/if_sriov.c:1.10 Fri Apr 30 06:41:36 2021 +++ src/sys/dev/pci/ixgbe/if_sriov.c Fri Apr 30 06:55:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sriov.c,v 1.10 2021/04/30 06:41:36 msaitoh Exp $ */ +/* $NetBSD: if_sriov.c,v 1.11 2021/04/30 06:55:32 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation @@ -33,6 +33,9 @@ **/ /*$FreeBSD: head/sys/dev/ixgbe/if_sriov.c 327031 2017-12-20 18:15:06Z erj $*/ +#include +__KERNEL_RCSID(0, "$NetBSD: if_sriov.c,v 1.11 2021/04/30 06:55:32 msaitoh Exp $"); + #include "ixgbe.h" #include "ixgbe_sriov.h" Index: src/sys/dev/pci/ixgbe/ixgbe_dcb.c diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.10 src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.11 --- src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.10 Fri Apr 30 06:41:36 2021 +++ src/sys/dev/pci/ixgbe/ixgbe_dcb.c Fri Apr 30 06:55:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe_dcb.c,v 1.10 2021/04/30 06:41:36 msaitoh Exp $ */ +/* $NetBSD: ixgbe_dcb.c,v 1.11 2021/04/30 06:55:32 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause @@ -34,6 +34,8 @@
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Fri Apr 30 06:41:36 UTC 2021 Modified Files: src/sys/dev/pci/ixgbe: if_bypass.c if_fdir.c if_sriov.c ixgbe_bypass.h ixgbe_dcb.c ixgbe_dcb.h ixgbe_dcb_82598.c ixgbe_dcb_82599.c ixgbe_dcb_82599.h ixgbe_fdir.h ixgbe_features.h ixgbe_netmap.c ixgbe_netmap.h ixgbe_rss.h ixgbe_sriov.h ixgbe_x540.h ixgbe_x550.h Log Message: Add NetBSD RCS IDs. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ixgbe/if_bypass.c \ src/sys/dev/pci/ixgbe/ixgbe_dcb.h src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/if_fdir.c \ src/sys/dev/pci/ixgbe/ixgbe_sriov.h cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/if_sriov.c \ src/sys/dev/pci/ixgbe/ixgbe_dcb.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe_bypass.h \ src/sys/dev/pci/ixgbe/ixgbe_netmap.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/ixgbe/ixgbe_dcb_82598.c \ src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/ixgbe/ixgbe_fdir.h \ src/sys/dev/pci/ixgbe/ixgbe_features.h \ src/sys/dev/pci/ixgbe/ixgbe_netmap.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_rss.h cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_x540.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_x550.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/if_bypass.c diff -u src/sys/dev/pci/ixgbe/if_bypass.c:1.6 src/sys/dev/pci/ixgbe/if_bypass.c:1.7 --- src/sys/dev/pci/ixgbe/if_bypass.c:1.6 Wed Aug 12 09:13:46 2020 +++ src/sys/dev/pci/ixgbe/if_bypass.c Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: if_bypass.c,v 1.7 2021/04/30 06:41:36 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation Index: src/sys/dev/pci/ixgbe/ixgbe_dcb.h diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.6 src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.7 --- src/sys/dev/pci/ixgbe/ixgbe_dcb.h:1.6 Wed Apr 4 08:13:07 2018 +++ src/sys/dev/pci/ixgbe/ixgbe_dcb.h Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: ixgbe_dcb.h,v 1.7 2021/04/30 06:41:36 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause Index: src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.6 src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.7 --- src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h:1.6 Wed Apr 4 08:13:07 2018 +++ src/sys/dev/pci/ixgbe/ixgbe_dcb_82599.h Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: ixgbe_dcb_82599.h,v 1.7 2021/04/30 06:41:36 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause Index: src/sys/dev/pci/ixgbe/if_fdir.c diff -u src/sys/dev/pci/ixgbe/if_fdir.c:1.3 src/sys/dev/pci/ixgbe/if_fdir.c:1.4 --- src/sys/dev/pci/ixgbe/if_fdir.c:1.3 Mon Sep 7 05:50:58 2020 +++ src/sys/dev/pci/ixgbe/if_fdir.c Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: if_fdir.c,v 1.4 2021/04/30 06:41:36 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation Index: src/sys/dev/pci/ixgbe/ixgbe_sriov.h diff -u src/sys/dev/pci/ixgbe/ixgbe_sriov.h:1.3 src/sys/dev/pci/ixgbe/ixgbe_sriov.h:1.4 --- src/sys/dev/pci/ixgbe/ixgbe_sriov.h:1.3 Wed Apr 4 08:13:07 2018 +++ src/sys/dev/pci/ixgbe/ixgbe_sriov.h Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: ixgbe_sriov.h,v 1.4 2021/04/30 06:41:36 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation Index: src/sys/dev/pci/ixgbe/if_sriov.c diff -u src/sys/dev/pci/ixgbe/if_sriov.c:1.9 src/sys/dev/pci/ixgbe/if_sriov.c:1.10 --- src/sys/dev/pci/ixgbe/if_sriov.c:1.9 Mon Jan 25 19:59:49 2021 +++ src/sys/dev/pci/ixgbe/if_sriov.c Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: if_sriov.c,v 1.10 2021/04/30 06:41:36 msaitoh Exp $ */ /** Copyright (c) 2001-2017, Intel Corporation Index: src/sys/dev/pci/ixgbe/ixgbe_dcb.c diff -u src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.9 src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.10 --- src/sys/dev/pci/ixgbe/ixgbe_dcb.c:1.9 Mon Sep 3 16:29:33 2018 +++ src/sys/dev/pci/ixgbe/ixgbe_dcb.c Fri Apr 30 06:41:36 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: ixgbe_dcb.c,v 1.10 2021/04/30 06:41:36 msaitoh Exp $ */ /** SPDX-License-Identifier: BSD-3-Clause Index: src/sys/dev/pci/ixgbe/ixgbe_bypass.h diff -u src/sys/dev/pci/ixgbe/ixgbe_bypass.h:1.1 src/sys/dev/pci/ixgbe/ixgbe_bypass.h:1.2 --- src/sys/dev/pci/ixgbe/ixgbe_bypass.h:1.1 Wed
