CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Thu Jan 21 06:57:26 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: remove accidental additions To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/arch/evbarm/conf/GENERIC64 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/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.172 src/sys/arch/evbarm/conf/GENERIC64:1.173 --- src/sys/arch/evbarm/conf/GENERIC64:1.172 Thu Jan 21 06:51:54 2021 +++ src/sys/arch/evbarm/conf/GENERIC64 Thu Jan 21 06:57:26 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.172 2021/01/21 06:51:54 nia Exp $ +# $NetBSD: GENERIC64,v 1.173 2021/01/21 06:57:26 nia Exp $ # # GENERIC ARM (aarch64) kernel # @@ -381,10 +381,6 @@ spi* at spibus? m25p* at spi? spiflash* at spiflashbus? -# BCM2835 VCHIQ, etc -vchiq0 at fdt? -vcaudio0 at vchiq0 - # Audio support hdaudio* at fdt? # Intel HDA hdaudio* at pci? dev ? function ?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Thu Jan 21 06:57:26 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: remove accidental additions To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Thu Jan 21 06:51:56 UTC 2021 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in src/sys/arch/amigappc/conf: GENERIC NULL src/sys/arch/atari/conf: GENERIC.in src/sys/arch/bebox/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC64 src/sys/arch/evbmips/conf: CPMBR1400 LINKITSMART7688 MALTA ZYXELKX src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY NET4501 src/sys/arch/mac68k/conf: GENERIC src/sys/arch/macppc/conf: GENERIC GENERIC_601 src/sys/arch/mvme68k/conf: GENERIC VME147 src/sys/arch/news68k/conf: GENERIC GENERIC_TINY LIBERO NEWS1200 src/sys/arch/next68k/conf: GENERIC SLAB src/sys/arch/ofppc/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/sandpoint/conf: ENCPP1 GENERIC SANDPOINT src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC64_IP2x GENERIC64_IP3x src/sys/arch/sun3/conf: DISKLESS DISKLESS3X GENERIC GENERIC3X INSTALL INSTALL3X src/sys/arch/x68k/conf: GENERIC INSTALL Log Message: add a commented out compat_ossaudio wherever there's compat_linux requested by mrg To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.331 -r1.332 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.147 -r1.148 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/amigappc/conf/NULL cvs rdiff -u -r1.120 -r1.121 src/sys/arch/atari/conf/GENERIC.in cvs rdiff -u -r1.164 -r1.165 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.171 -r1.172 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/CPMBR1400 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbmips/conf/LINKITSMART7688 cvs rdiff -u -r1.102 -r1.103 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/conf/ZYXELKX cvs rdiff -u -r1.62 -r1.63 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.206 -r1.207 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.169 -r1.170 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.162 -r1.163 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.104 -r1.105 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.232 -r1.233 src/sys/arch/mac68k/conf/GENERIC cvs rdiff -u -r1.371 -r1.372 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.28 -r1.29 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.102 -r1.103 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mvme68k/conf/VME147 cvs rdiff -u -r1.137 -r1.138 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.91 -r1.92 src/sys/arch/news68k/conf/GENERIC_TINY cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/conf/LIBERO \ src/sys/arch/news68k/conf/NEWS1200 cvs rdiff -u -r1.151 -r1.152 src/sys/arch/next68k/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/next68k/conf/SLAB cvs rdiff -u -r1.174 -r1.175 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.194 -r1.195 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.44 -r1.45 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sandpoint/conf/ENCPP1 cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/conf/SANDPOINT cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sgimips/conf/GENERIC32_IP12 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/conf/GENERIC64_IP2x \ src/sys/arch/sgimips/conf/GENERIC64_IP3x cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sun3/conf/DISKLESS cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sun3/conf/DISKLESS3X \ src/sys/arch/sun3/conf/INSTALL3X cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sun3/conf/GENERIC cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sun3/conf/GENERIC3X cvs rdiff -u -r1.62 -r1.63 src/sys/arch/sun3/conf/INSTALL cvs rdiff -u -r1.202 -r1.203 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.119 -r1.120 src/sys/arch/x68k/conf/INSTALL 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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.196 src/sys/arch/amiga/conf/DRACO:1.197 --- src/sys/arch/amiga/conf/DRACO:1.196 Mon Oct 26 06:22:28 2020 +++ src/sys/arch/amiga/conf/DRACO Thu Jan 21 06:51:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.196 2020/10/26 06:22:28 rin Exp $ +# $NetBSD: DRACO,v 1.197 2021/01/21 06:51:54 nia Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Thu Jan 21 06:51:56 UTC 2021 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in src/sys/arch/amigappc/conf: GENERIC NULL src/sys/arch/atari/conf: GENERIC.in src/sys/arch/bebox/conf: GENERIC src/sys/arch/evbarm/conf: GENERIC64 src/sys/arch/evbmips/conf: CPMBR1400 LINKITSMART7688 MALTA ZYXELKX src/sys/arch/ews4800mips/conf: GENERIC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY NET4501 src/sys/arch/mac68k/conf: GENERIC src/sys/arch/macppc/conf: GENERIC GENERIC_601 src/sys/arch/mvme68k/conf: GENERIC VME147 src/sys/arch/news68k/conf: GENERIC GENERIC_TINY LIBERO NEWS1200 src/sys/arch/next68k/conf: GENERIC SLAB src/sys/arch/ofppc/conf: GENERIC src/sys/arch/prep/conf: GENERIC src/sys/arch/rs6000/conf: GENERIC src/sys/arch/sandpoint/conf: ENCPP1 GENERIC SANDPOINT src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC64_IP2x GENERIC64_IP3x src/sys/arch/sun3/conf: DISKLESS DISKLESS3X GENERIC GENERIC3X INSTALL INSTALL3X src/sys/arch/x68k/conf: GENERIC INSTALL Log Message: add a commented out compat_ossaudio wherever there's compat_linux requested by mrg To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.331 -r1.332 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.147 -r1.148 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amigappc/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/amigappc/conf/NULL cvs rdiff -u -r1.120 -r1.121 src/sys/arch/atari/conf/GENERIC.in cvs rdiff -u -r1.164 -r1.165 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.171 -r1.172 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/CPMBR1400 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbmips/conf/LINKITSMART7688 cvs rdiff -u -r1.102 -r1.103 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/conf/ZYXELKX cvs rdiff -u -r1.62 -r1.63 src/sys/arch/ews4800mips/conf/GENERIC cvs rdiff -u -r1.206 -r1.207 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.169 -r1.170 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.162 -r1.163 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.104 -r1.105 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.232 -r1.233 src/sys/arch/mac68k/conf/GENERIC cvs rdiff -u -r1.371 -r1.372 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.28 -r1.29 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.102 -r1.103 src/sys/arch/mvme68k/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mvme68k/conf/VME147 cvs rdiff -u -r1.137 -r1.138 src/sys/arch/news68k/conf/GENERIC cvs rdiff -u -r1.91 -r1.92 src/sys/arch/news68k/conf/GENERIC_TINY cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/conf/LIBERO \ src/sys/arch/news68k/conf/NEWS1200 cvs rdiff -u -r1.151 -r1.152 src/sys/arch/next68k/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/next68k/conf/SLAB cvs rdiff -u -r1.174 -r1.175 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.194 -r1.195 src/sys/arch/prep/conf/GENERIC cvs rdiff -u -r1.44 -r1.45 src/sys/arch/rs6000/conf/GENERIC cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sandpoint/conf/ENCPP1 cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/conf/SANDPOINT cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sgimips/conf/GENERIC32_IP12 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/conf/GENERIC64_IP2x \ src/sys/arch/sgimips/conf/GENERIC64_IP3x cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sun3/conf/DISKLESS cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sun3/conf/DISKLESS3X \ src/sys/arch/sun3/conf/INSTALL3X cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sun3/conf/GENERIC cvs rdiff -u -r1.138 -r1.139 src/sys/arch/sun3/conf/GENERIC3X cvs rdiff -u -r1.62 -r1.63 src/sys/arch/sun3/conf/INSTALL cvs rdiff -u -r1.202 -r1.203 src/sys/arch/x68k/conf/GENERIC cvs rdiff -u -r1.119 -r1.120 src/sys/arch/x68k/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Thu Jan 21 06:18:22 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: POGO src/sys/arch/zaurus/conf: INSTALL Log Message: remove "no options" for compat_ossaudio now it's disabled by default To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.40 -r1.41 src/sys/arch/zaurus/conf/INSTALL 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/evbarm/conf/POGO diff -u src/sys/arch/evbarm/conf/POGO:1.9 src/sys/arch/evbarm/conf/POGO:1.10 --- src/sys/arch/evbarm/conf/POGO:1.9 Sun Aug 16 10:27:47 2020 +++ src/sys/arch/evbarm/conf/POGO Thu Jan 21 06:18:22 2021 @@ -2,7 +2,6 @@ include "arch/evbarm/conf/SHEEVAPLUG" -no options COMPAT_OSSAUDIO no options DIAGNOSTIC no options DEBUG no uaudio* Index: src/sys/arch/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.40 src/sys/arch/zaurus/conf/INSTALL:1.41 --- src/sys/arch/zaurus/conf/INSTALL:1.40 Wed Nov 13 17:59:56 2019 +++ src/sys/arch/zaurus/conf/INSTALL Thu Jan 21 06:18:22 2021 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.40 2019/11/13 17:59:56 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.41 2021/01/21 06:18:22 nia Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -40,8 +40,6 @@ no options COMPAT_13 no options COMPAT_43 no options COMPAT_44 -no options COMPAT_OSSAUDIO - no options DKWEDGE_AUTODISCOVER no options SYSVMSG
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Thu Jan 21 06:18:22 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: POGO src/sys/arch/zaurus/conf: INSTALL Log Message: remove "no options" for compat_ossaudio now it's disabled by default To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.40 -r1.41 src/sys/arch/zaurus/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/arch/mips
Module Name:src Committed By: simonb Date: Thu Jan 21 00:56:41 UTC 2021 Modified Files: src/tests/lib/libc/arch/mips: return_one.S Log Message: Use .set noreorder and use reg names. atf- lib/libc/sys/t_mprotect mprotect_mremap_exec is a bit happier now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/arch/mips/return_one.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/arch/mips/return_one.S diff -u src/tests/lib/libc/arch/mips/return_one.S:1.2 src/tests/lib/libc/arch/mips/return_one.S:1.3 --- src/tests/lib/libc/arch/mips/return_one.S:1.2 Thu Feb 14 10:36:33 2019 +++ src/tests/lib/libc/arch/mips/return_one.S Thu Jan 21 00:56:41 2021 @@ -1,11 +1,13 @@ -/* $NetBSD: return_one.S,v 1.2 2019/02/14 10:36:33 mrg Exp $ */ +/* $NetBSD: return_one.S,v 1.3 2021/01/21 00:56:41 simonb Exp $ */ #include +.set noreorder + .globl return_one, return_one_end; return_one: - jr $31 - li $2,1 + jr ra + li v0,1 return_one_end:
CVS commit: src/tests/lib/libc/arch/mips
Module Name:src Committed By: simonb Date: Thu Jan 21 00:56:41 UTC 2021 Modified Files: src/tests/lib/libc/arch/mips: return_one.S Log Message: Use .set noreorder and use reg names. atf- lib/libc/sys/t_mprotect mprotect_mremap_exec is a bit happier now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/arch/mips/return_one.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Jan 21 00:38:28 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: cond-token-plain.exp cond-token-plain.mk
cond-token-string.exp cond-token-string.mk
Log Message:
make(1): add more tests for tokens in conditionals
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-token-plain.exp \
src/usr.bin/make/unit-tests/cond-token-string.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-token-plain.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-token-string.exp
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/make/unit-tests/cond-token-plain.exp
diff -u src/usr.bin/make/unit-tests/cond-token-plain.exp:1.3 src/usr.bin/make/unit-tests/cond-token-plain.exp:1.4
--- src/usr.bin/make/unit-tests/cond-token-plain.exp:1.3 Sat Sep 12 17:47:24 2020
+++ src/usr.bin/make/unit-tests/cond-token-plain.exp Thu Jan 21 00:38:28 2021
@@ -26,4 +26,16 @@ CondParser_Eval: ${:Uvar}& != "var&
lhs = "var&", rhs = "var&", op = !=
CondParser_Eval: ${:Uvar}||name != "var||name"
lhs = "var||name", rhs = "var||name", op = !=
+CondParser_Eval: bare
+make: "cond-token-plain.mk" line 102: A bare word is treated like defined(...), and the variable 'bare' is not defined.
+CondParser_Eval: VAR
+make: "cond-token-plain.mk" line 107: A bare word is treated like defined(...).
+CondParser_Eval: V${:UA}R
+make: "cond-token-plain.mk" line 114: ok
+CondParser_Eval: V${UNDEF}AR
+make: "cond-token-plain.mk" line 122: Undefined variables in bare words expand to an empty string.
+CondParser_Eval: 0${:Ux00}
+make: "cond-token-plain.mk" line 130: Numbers can be composed from literals and variable expressions.
+CondParser_Eval: 0${:Ux01}
+make: "cond-token-plain.mk" line 134: Numbers can be composed from literals and variable expressions.
exit status 0
Index: src/usr.bin/make/unit-tests/cond-token-string.mk
diff -u src/usr.bin/make/unit-tests/cond-token-string.mk:1.3 src/usr.bin/make/unit-tests/cond-token-string.mk:1.4
--- src/usr.bin/make/unit-tests/cond-token-string.mk:1.3 Tue Nov 10 22:23:37 2020
+++ src/usr.bin/make/unit-tests/cond-token-string.mk Thu Jan 21 00:38:28 2021
@@ -1,6 +1,10 @@
-# $NetBSD: cond-token-string.mk,v 1.3 2020/11/10 22:23:37 rillig Exp $
+# $NetBSD: cond-token-string.mk,v 1.4 2021/01/21 00:38:28 rillig Exp $
#
-# Tests for quoted and unquoted string literals in .if conditions.
+# Tests for quoted string literals in .if conditions.
+#
+# See also:
+# cond-token-plain.mk
+# Covers string literals without quotes (called "bare words").
# TODO: Implementation
@@ -35,5 +39,44 @@
. error
.endif
+.MAKEFLAGS: -dc
+
+# A string in quotes is checked whether it is not empty.
+.if "UNDEF"
+. info The string literal "UNDEF" is not empty.
+.else
+. error
+.endif
+
+# A space is not empty as well.
+# This differs from many other places where whitespace is trimmed.
+.if " "
+. info The string literal " " is not empty, even though it consists of $\
+ whitespace only.
+.else
+. error
+.endif
+
+.if "${UNDEF}"
+. error
+.else
+. info An undefined variable in quotes expands to an empty string, which $\
+ then evaluates to false.
+.endif
+
+.if "${:Uvalue}"
+. info A nonempty variable expression evaluates to true.
+.else
+. error
+.endif
+
+.if "${:U}"
+. error
+.else
+. info An empty variable evaluates to false.
+.endif
+
+.MAKEFLAGS: -d0
+
all:
@:;
Index: src/usr.bin/make/unit-tests/cond-token-plain.mk
diff -u src/usr.bin/make/unit-tests/cond-token-plain.mk:1.6 src/usr.bin/make/unit-tests/cond-token-plain.mk:1.7
--- src/usr.bin/make/unit-tests/cond-token-plain.mk:1.6 Sun Nov 15 14:58:14 2020
+++ src/usr.bin/make/unit-tests/cond-token-plain.mk Thu Jan 21 00:38:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: cond-token-plain.mk,v 1.6 2020/11/15 14:58:14 rillig Exp $
+# $NetBSD: cond-token-plain.mk,v 1.7 2021/01/21 00:38:28 rillig Exp $
#
# Tests for plain tokens (that is, string literals without quotes)
# in .if conditions.
@@ -93,5 +93,51 @@
. error
.endif
+# A bare word may appear alone in a condition, without any comparison
+# operator. It is implicitly converted into defined(bare).
+.if bare
+. error
+.else
+. info A bare word is treated like defined(...), and the variable $\
+ 'bare' is not defined.
+.endif
+
+VAR= defined
+.if VAR
+. info A bare word is treated like defined(...).
+.else
+. error
+.endif
+
+# Bare words may be intermixed with variable expressions.
+.if V${:UA}R
+. info ok
+.else
+. error
+.endif
+
+# In bare words, even undefined variables are allowed. Without the bare
+# words, undefined variables are not allowed. That feels inconsistent.
+.if V${UNDEF}AR
+. info Undefined variables in bare words expand to an empty string.
+.else
+. error
+.endif
+
+.if 0${:Ux00}
+. error
+.else
+. info Numbers can be composed from literals and variable
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Jan 21 00:38:28 UTC 2021 Modified Files: src/usr.bin/make/unit-tests: cond-token-plain.exp cond-token-plain.mk cond-token-string.exp cond-token-string.mk Log Message: make(1): add more tests for tokens in conditionals To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-token-plain.exp \ src/usr.bin/make/unit-tests/cond-token-string.mk cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/cond-token-plain.mk cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-token-string.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jdolecek
Date: Wed Jan 20 22:46:33 UTC 2021
Modified Files:
src/sys/dev/usb: umidi.c
Log Message:
fix free_all_endpoints() to not try calling free_pipe() when no endpoints
are allocated; this can happen during config_detach() after attach fails
Reported-by: syzbot+6e8a4c978358ecead...@syzkaller.appspotmail.com
Reported-by: syzbot+b25ba25b57561144a...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/umidi.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/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.82 src/sys/dev/usb/umidi.c:1.83
--- src/sys/dev/usb/umidi.c:1.82 Thu Jan 2 08:08:30 2020
+++ src/sys/dev/usb/umidi.c Wed Jan 20 22:46:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.82 2020/01/02 08:08:30 maxv Exp $ */
+/* $NetBSD: umidi.c,v 1.83 2021/01/20 22:46:33 jdolecek Exp $ */
/*
* Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.82 2020/01/02 08:08:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.83 2021/01/20 22:46:33 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -756,10 +756,14 @@ free_all_endpoints(struct umidi_softc *s
{
int i;
+ if (sc->sc_endpoints == NULL) {
+ /* nothing to free */
+ return;
+ }
+
for (i=0; isc_in_num_endpoints+sc->sc_out_num_endpoints; i++)
free_pipe(>sc_endpoints[i]);
- if (sc->sc_endpoints != NULL)
- kmem_free(sc->sc_endpoints, sc->sc_endpoints_len);
+ kmem_free(sc->sc_endpoints, sc->sc_endpoints_len);
sc->sc_endpoints = sc->sc_out_ep = sc->sc_in_ep = NULL;
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jdolecek Date: Wed Jan 20 22:46:33 UTC 2021 Modified Files: src/sys/dev/usb: umidi.c Log Message: fix free_all_endpoints() to not try calling free_pipe() when no endpoints are allocated; this can happen during config_detach() after attach fails Reported-by: syzbot+6e8a4c978358ecead...@syzkaller.appspotmail.com Reported-by: syzbot+b25ba25b57561144a...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/umidi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/arch
"Nia Alarie" writes: > Module Name: src > Committed By: nia > Date: Wed Jan 20 13:22:08 UTC 2021 > > Modified Files: > src/sys/arch/amd64/conf: GENERIC MODULAR XEN3_DOM0 XEN3_DOMU > src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 > src/sys/arch/i386/conf: GENERIC MODULAR XEN3PAE_DOM0 XEN3PAE_DOMU > src/sys/arch/landisk/conf: GENERIC > src/sys/arch/usermode/conf: GENERIC.common > src/sys/arch/zaurus/conf: GENERIC > > Log Message: > remove compat_ossaudio from kernel modules > > this is only useful with compat_linux and gets autoloaded when > compat_linux is loaded, so there's no reason to bake it into kernels > any more. not everyone uses COMPAT_LINUX as a module. this seems reasonable to have as a comment anywhere COMAPT_LINUX is commented. at least the GENERIC*s should have it, IMO. additionally, there are a few issues remaining. eg, the evbarm/conf/POGO kernel now has a useless "no options" for COMPAT_OSSAUDIO, and there are at least a handful of commented versions remaining. .mrg.
CVS commit: src/sys/dev
Module Name:src
Committed By: reinoud
Date: Wed Jan 20 21:59:49 UTC 2021
Modified Files:
src/sys/dev/acpi: virtio_acpi.c
src/sys/dev/fdt: virtio_mmio_fdt.c
src/sys/dev/pci: virtio.c virtio_pci.c virtiovar.h
Log Message:
Remove the virtio child driver finalisation check KASSERT that, while it
should never trigger, a possible bug in a child driver shouldn't have to panic
the kernel. Instead report the internal error.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/virtio_mmio_fdt.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/virtiovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.5 src/sys/dev/acpi/virtio_acpi.c:1.6
--- src/sys/dev/acpi/virtio_acpi.c:1.5 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/acpi/virtio_acpi.c Wed Jan 20 21:59:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.6 2021/01/20 21:59:48 reinoud Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.6 2021/01/20 21:59:48 reinoud Exp $");
#include
#include
@@ -168,12 +168,6 @@ virtio_acpi_rescan(device_t self, const
if (virtio_attach_failed(vsc))
return 0;
- /*
- * Make sure child drivers initialize interrupts via call
- * to virtio_child_attach_finish().
- */
- KASSERT(msc->sc_ih != NULL);
-
return 0;
}
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.5 src/sys/dev/fdt/virtio_mmio_fdt.c:1.6
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.5 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Wed Jan 20 21:59:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.6 2021/01/20 21:59:48 reinoud Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.6 2021/01/20 21:59:48 reinoud Exp $");
#include
#include
@@ -128,12 +128,6 @@ virtio_mmio_fdt_rescan(device_t self, co
if (virtio_attach_failed(vsc))
return 0;
- /*
- * Make sure child drivers initialize interrupts via call
- * to virtio_child_attach_finish().
- */
- KASSERT(msc->sc_ih != NULL);
-
return 0;
}
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.43 src/sys/dev/pci/virtio.c:1.44
--- src/sys/dev/pci/virtio.c:1.43 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/virtio.c Wed Jan 20 21:59:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.43 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: virtio.c,v 1.44 2021/01/20 21:59:48 reinoud Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.43 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.44 2021/01/20 21:59:48 reinoud Exp $");
#include
#include
@@ -1084,6 +1084,7 @@ virtio_child_attach_finish(struct virtio
{
int r;
+ sc->sc_finished_called = true;
r = sc->sc_ops->setup_interrupts(sc);
if (r != 0) {
aprint_error_dev(sc->sc_dev, "failed to setup interrupts\n");
@@ -1187,6 +1188,14 @@ virtio_attach_failed(struct virtio_softc
aprint_error_dev(self, "virtio configuration failed\n");
return 1;
}
+
+ /* sanity check */
+ if (!sc->sc_finished_called) {
+ aprint_error_dev(self, "virtio internal error, child driver "
+ "signaled OK but didn't initialize interrupts\n");
+ return 1;
+ }
+
return 0;
}
Index: src/sys/dev/pci/virtio_pci.c
diff -u src/sys/dev/pci/virtio_pci.c:1.15 src/sys/dev/pci/virtio_pci.c:1.16
--- src/sys/dev/pci/virtio_pci.c:1.15 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/virtio_pci.c Wed Jan 20 21:59:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.15 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.16 2021/01/20 21:59:48 reinoud Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.15 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.16 2021/01/20 21:59:48 reinoud Exp $");
#include
#include
@@ -351,12 +351,6 @@ virtio_pci_rescan(device_t self, const c
if (virtio_attach_failed(sc))
return 0;
- /*
- * Make sure child drivers initialize interrupts via call
- * to virtio_child_attach_finish().
- */
- KASSERT(psc->sc_ihs_num != 0);
-
CVS commit: src/sys/dev
Module Name:src Committed By: reinoud Date: Wed Jan 20 21:59:49 UTC 2021 Modified Files: src/sys/dev/acpi: virtio_acpi.c src/sys/dev/fdt: virtio_mmio_fdt.c src/sys/dev/pci: virtio.c virtio_pci.c virtiovar.h Log Message: Remove the virtio child driver finalisation check KASSERT that, while it should never trigger, a possible bug in a child driver shouldn't have to panic the kernel. Instead report the internal error. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/virtio_acpi.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/virtio_mmio_fdt.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/virtio.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/virtio_pci.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/virtiovar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: jdolecek Date: Wed Jan 20 21:39:09 UTC 2021 Modified Files: src/sys/kern: kern_event.c Log Message: fix a race in kqueue_scan() - when multiple threads check the same kqueue, it could happen other thread seen empty kqueue while kevent was being checked for re-firing and re-queued make sure to keep retrying if there are outstanding kevents even if no kevent is found on first pass through the queue, and only drop the KN_QUEUED flag and kq_count when actually completely done with the kevent change is inspired by the FreeBSD in-flux handling, but without introducing the reference counting PR kern/50094 by Christof Meerwald To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/kern/kern_event.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: jdolecek
Date: Wed Jan 20 21:39:09 UTC 2021
Modified Files:
src/sys/kern: kern_event.c
Log Message:
fix a race in kqueue_scan() - when multiple threads check the same
kqueue, it could happen other thread seen empty kqueue while kevent
was being checked for re-firing and re-queued
make sure to keep retrying if there are outstanding kevents even
if no kevent is found on first pass through the queue, and only
drop the KN_QUEUED flag and kq_count when actually completely done
with the kevent
change is inspired by the FreeBSD in-flux handling, but without
introducing the reference counting
PR kern/50094 by Christof Meerwald
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/kern/kern_event.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.110 src/sys/kern/kern_event.c:1.111
--- src/sys/kern/kern_event.c:1.110 Sun Dec 27 12:45:33 2020
+++ src/sys/kern/kern_event.c Wed Jan 20 21:39:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.110 2020/12/27 12:45:33 jdolecek Exp $ */
+/* $NetBSD: kern_event.c,v 1.111 2021/01/20 21:39:09 jdolecek Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.110 2020/12/27 12:45:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.111 2021/01/20 21:39:09 jdolecek Exp $");
#include
#include
@@ -179,6 +179,8 @@ static int kq_calloutmax = (4 * 1024);
extern const struct filterops sig_filtops;
+#define KQ_FLUX_WAKEUP(kq) cv_broadcast(>kq_cv)
+
/*
* Table for for all system-defined filters.
* These should be listed in the numeric order of the EVFILT_* defines.
@@ -1396,7 +1398,7 @@ kqueue_scan(file_t *fp, size_t maxevents
struct timespec ats, sleepts;
struct knote *kn, *marker, morker;
size_t count, nkev, nevents;
- int timeout, error, touch, rv;
+ int timeout, error, touch, rv, influx;
filedesc_t *fdp;
fdp = curlwp->l_fd;
@@ -1450,39 +1452,48 @@ kqueue_scan(file_t *fp, size_t maxevents
/* mark end of knote list */
TAILQ_INSERT_TAIL(>kq_head, marker, kn_tqe);
+ influx = 0;
/*
* Acquire the fdp->fd_lock interlock to avoid races with
* file creation/destruction from other threads.
*/
+relock:
mutex_spin_exit(>kq_lock);
mutex_enter(>fd_lock);
mutex_spin_enter(>kq_lock);
while (count != 0) {
kn = TAILQ_FIRST(>kq_head); /* get next knote */
- while ((kn->kn_status & KN_MARKER) != 0) {
- if (kn == marker) {
-/* it's our marker, stop */
-TAILQ_REMOVE(>kq_head, kn, kn_tqe);
-if (count < maxevents || (tsp != NULL &&
-(timeout = gettimeleft(,
-)) <= 0))
- goto queue_processed;
+
+ if ((kn->kn_status & KN_MARKER) != 0 && kn != marker) {
+ if (influx) {
+influx = 0;
+KQ_FLUX_WAKEUP(kq);
+ }
+ mutex_exit(>fd_lock);
+ (void)cv_wait_sig(>kq_cv, >kq_lock);
+ goto relock;
+ }
+
+ TAILQ_REMOVE(>kq_head, kn, kn_tqe);
+ if (kn == marker) {
+ /* it's our marker, stop */
+ KQ_FLUX_WAKEUP(kq);
+ if (count == maxevents) {
mutex_exit(>fd_lock);
goto retry;
}
- /* someone else's marker. */
- kn = TAILQ_NEXT(kn, kn_tqe);
+ break;
}
+ KASSERT((kn->kn_status & KN_BUSY) == 0);
+
kq_check(kq);
- kq->kq_count--;
- TAILQ_REMOVE(>kq_head, kn, kn_tqe);
- kn->kn_status &= ~KN_QUEUED;
kn->kn_status |= KN_BUSY;
kq_check(kq);
if (kn->kn_status & KN_DISABLED) {
- kn->kn_status &= ~KN_BUSY;
+ kq->kq_count--;
+ kn->kn_status &= ~(KN_QUEUED|KN_BUSY);
/* don't want disabled events */
continue;
}
@@ -1495,17 +1506,14 @@ kqueue_scan(file_t *fp, size_t maxevents
rv = (*kn->kn_fop->f_event)(kn, 0);
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
mutex_spin_enter(>kq_lock);
- /* Re-poll if note was re-enqueued. */
- if ((kn->kn_status & KN_QUEUED) != 0) {
-kn->kn_status &= ~KN_BUSY;
-continue;
- }
if (rv == 0) {
/*
* non-ONESHOT event that hasn't
* triggered again, so de-queue.
*/
-kn->kn_status &= ~(KN_ACTIVE|KN_BUSY);
+kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE|KN_BUSY);
+kq->kq_count--;
+influx = 1;
continue;
}
}
@@ -1524,9 +1532,11 @@ kqueue_scan(file_t *fp, size_t maxevents
}
kevp++;
nkev++;
+ influx = 1;
if (kn->kn_flags & EV_ONESHOT) {
/* delete ONESHOT events after retrieval */
- kn->kn_status &= ~KN_BUSY;
+ kn->kn_status &= ~(KN_QUEUED|KN_BUSY);
+ kq->kq_count--;
mutex_spin_exit(>kq_lock);
knote_detach(kn, fdp, true);
mutex_enter(>fd_lock);
@@ -1544,20 +1554,23 @@ kqueue_scan(file_t *fp, size_t maxevents
kn->kn_fflags = 0;
}
kn->kn_status &= ~(KN_QUEUED|KN_ACTIVE|KN_BUSY);
+ kq->kq_count--;
} else if (kn->kn_flags & EV_DISPATCH) {
kn->kn_status |= KN_DISABLED;
kn->kn_status &=
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Wed Jan 20 21:38:44 UTC 2021 Modified Files: src/sys/arch/amd64/conf: NOCOMPAT Log Message: COMPAT_OSSAUDIO no longer exists; remove dangling reference To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/arch/amd64/conf/NOCOMPAT:1.6 --- src/sys/arch/amd64/conf/NOCOMPAT:1.5 Sun Aug 16 10:27:47 2020 +++ src/sys/arch/amd64/conf/NOCOMPAT Wed Jan 20 21:38:44 2021 @@ -1,6 +1,6 @@ include "arch/amd64/conf/GENERIC" -#ident "NOCOMPAT-$Revision: 1.5 $" +#ident "NOCOMPAT-$Revision: 1.6 $" no options SYSVMSG # System V-like message queues no options SYSVSEM # System V-like semaphores @@ -31,6 +31,5 @@ no options COMPAT_15 #no options COMPAT_80 #no options COMPAT_90 -no options COMPAT_OSSAUDIO no options COMPAT_NETBSD32 no options EXEC_ELF32 # requires COMPAT_NETBSD32
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Wed Jan 20 21:38:44 UTC 2021 Modified Files: src/sys/arch/amd64/conf: NOCOMPAT Log Message: COMPAT_OSSAUDIO no longer exists; remove dangling reference To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.
CVS commit: src/sys/dev
Module Name:src
Committed By: reinoud
Date: Wed Jan 20 19:46:48 UTC 2021
Modified Files:
src/sys/dev/acpi: virtio_acpi.c
src/sys/dev/fdt: virtio_mmio_fdt.c
src/sys/dev/pci: if_vioif.c ld_virtio.c vio9p.c viomb.c viornd.c
vioscsi.c virtio.c virtio_pci.c virtioreg.h virtiovar.h
src/sys/dev/virtio: virtio_mmio.c
Added Files:
src/sys/dev/pci: virtio_pcireg.h
Log Message:
Add VirtIO PCI v1.0 attachments and fix the drivers affected.
The vioif, ld, scsi, viornd and viomb devices were adjusted when needed and
tested both in legacy 0.9 and v1.0 attachments trough PCI on amd64, sparc64,
aarch64 and aarch64-eb. ACPI/FDT attachments also tested on
aarch64/aarch64-eb.
Known issues
* viomb on aarch64 works only with ACPI/FDT attachment but not with PCI
attachment. PCI and ACPI/FDT attachment works on aarch64-eb.
* virtio on sparc64 attaches but is it not functioning though not a
regression.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/virtio_mmio_fdt.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/ld_virtio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/vio9p.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/viomb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/viornd.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/vioscsi.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/virtio_pcireg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/virtioreg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/virtiovar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/virtio/virtio_mmio.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/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.4 src/sys/dev/acpi/virtio_acpi.c:1.5
--- src/sys/dev/acpi/virtio_acpi.c:1.4 Mon Dec 7 10:02:51 2020
+++ src/sys/dev/acpi/virtio_acpi.c Wed Jan 20 19:46:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $");
#include
#include
@@ -163,7 +163,16 @@ virtio_acpi_rescan(device_t self, const
memset(, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, ifattr, , virtiobusprint);
+ config_found_ia(self, ifattr, , NULL);
+
+ if (virtio_attach_failed(vsc))
+ return 0;
+
+ /*
+ * Make sure child drivers initialize interrupts via call
+ * to virtio_child_attach_finish().
+ */
+ KASSERT(msc->sc_ih != NULL);
return 0;
}
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.4 src/sys/dev/fdt/virtio_mmio_fdt.c:1.5
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.4 Fri Jan 15 22:35:39 2021
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Wed Jan 20 19:46:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.4 2021/01/15 22:35:39 jmcneill Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.4 2021/01/15 22:35:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.5 2021/01/20 19:46:48 reinoud Exp $");
#include
#include
@@ -119,19 +119,14 @@ virtio_mmio_fdt_rescan(device_t self, co
if (vsc->sc_child) /* Child already attached? */
return 0;
+
memset(, 0, sizeof(va));
va.sc_childdevid = vsc->sc_childdevid;
- config_found_ia(self, attr, , virtiobusprint);
+ config_found_ia(self, attr, , NULL);
- if (vsc->sc_child == NULL) {
+ if (virtio_attach_failed(vsc))
return 0;
- }
-
- if (vsc->sc_child == VIRTIO_CHILD_FAILED) {
- aprint_error_dev(self, "virtio configuration failed\n");
- return 0;
- }
/*
* Make sure child drivers initialize interrupts via call
@@ -164,7 +159,7 @@ virtio_mmio_fdt_setup_interrupts(struct
return -1;
}
- if (vsc->sc_flags & VIRTIO_F_PCI_INTR_MPSAFE)
+ if (vsc->sc_flags & VIRTIO_F_INTR_MPSAFE)
flags |= FDT_INTR_MPSAFE;
msc->sc_ih = fdtbus_intr_establish_xname(fsc->sc_phandle, 0,
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.65 src/sys/dev/pci/if_vioif.c:1.66
--- src/sys/dev/pci/if_vioif.c:1.65 Thu May 28 23:25:17 2020
+++ src/sys/dev/pci/if_vioif.c Wed Jan 20 19:46:48 2021
@@ -1,6 +1,7 @@
-/* $NetBSD: if_vioif.c,v 1.65 2020/05/28 23:25:17 riastradh Exp $ */
+/* $NetBSD: if_vioif.c,v 1.66 2021/01/20 19:46:48 reinoud Exp $ */
/*
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
*
CVS commit: src/sys/dev
Module Name:src Committed By: reinoud Date: Wed Jan 20 19:46:48 UTC 2021 Modified Files: src/sys/dev/acpi: virtio_acpi.c src/sys/dev/fdt: virtio_mmio_fdt.c src/sys/dev/pci: if_vioif.c ld_virtio.c vio9p.c viomb.c viornd.c vioscsi.c virtio.c virtio_pci.c virtioreg.h virtiovar.h src/sys/dev/virtio: virtio_mmio.c Added Files: src/sys/dev/pci: virtio_pcireg.h Log Message: Add VirtIO PCI v1.0 attachments and fix the drivers affected. The vioif, ld, scsi, viornd and viomb devices were adjusted when needed and tested both in legacy 0.9 and v1.0 attachments trough PCI on amd64, sparc64, aarch64 and aarch64-eb. ACPI/FDT attachments also tested on aarch64/aarch64-eb. Known issues * viomb on aarch64 works only with ACPI/FDT attachment but not with PCI attachment. PCI and ACPI/FDT attachment works on aarch64-eb. * virtio on sparc64 attaches but is it not functioning though not a regression. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/virtio_acpi.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/virtio_mmio_fdt.c cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_vioif.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/ld_virtio.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/vio9p.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/viomb.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/viornd.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/vioscsi.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/virtio.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/virtio_pci.c cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/virtio_pcireg.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/virtioreg.h cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/virtiovar.h cvs rdiff -u -r1.3 -r1.4 src/sys/dev/virtio/virtio_mmio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Wed Jan 20 18:26:11 UTC 2021 Modified Files: src/sys/dev/pci: if_rge.c Log Message: Sync with OpenBSD if_rge.c r1.4 """ Change users of IFQ_SET_MAXLEN() and IFQ_IS_EMPTY() to use the "new" API. """ To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_rge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Wed Jan 20 18:26:11 UTC 2021 Modified Files: src/sys/dev/pci: if_rge.c Log Message: Sync with OpenBSD if_rge.c r1.4 """ Change users of IFQ_SET_MAXLEN() and IFQ_IS_EMPTY() to use the "new" API. """ To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_rge.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/if_rge.c diff -u src/sys/dev/pci/if_rge.c:1.14 src/sys/dev/pci/if_rge.c:1.15 --- src/sys/dev/pci/if_rge.c:1.14 Sat May 30 22:39:40 2020 +++ src/sys/dev/pci/if_rge.c Wed Jan 20 18:26:11 2021 @@ -1,5 +1,5 @@ -/* $NetBSD: if_rge.c,v 1.14 2020/05/30 22:39:40 sevan Exp $ */ -/* $OpenBSD: if_rge.c,v 1.3 2020/03/27 15:15:24 krw Exp $ */ +/* $NetBSD: if_rge.c,v 1.15 2021/01/20 18:26:11 jakllsch Exp $ */ +/* $OpenBSD: if_rge.c,v 1.4 2020/07/10 13:26:38 patrick Exp $ */ /* * Copyright (c) 2019 Kevin Lo @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.14 2020/05/30 22:39:40 sevan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.15 2021/01/20 18:26:11 jakllsch Exp $"); /* #include "vlan.h" Sevan */ @@ -306,7 +306,7 @@ rge_attach(device_t parent, device_t sel ifp->if_ioctl = rge_ioctl; ifp->if_start = rge_start; ifp->if_watchdog = rge_watchdog; - IFQ_SET_MAXLEN(>if_snd, RGE_TX_LIST_CNT); + ifq_set_maxlen(>if_snd, RGE_TX_LIST_CNT); ifp->if_mtu = RGE_JUMBO_MTU; ifp->if_capabilities = ETHERCAP_VLAN_MTU | IFCAP_CSUM_IPv4_Rx |
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src Committed By: skrll Date: Wed Jan 20 15:27:51 UTC 2021 Modified Files: src/usr.sbin/acpitools/acpidump: acpi.c Log Message: Consistently use ACPI_SIG_SSDT To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/acpitools/acpidump/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src
Committed By: skrll
Date: Wed Jan 20 15:27:51 UTC 2021
Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c
Log Message:
Consistently use ACPI_SIG_SSDT
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/acpitools/acpidump/acpi.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.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.49 src/usr.sbin/acpitools/acpidump/acpi.c:1.50
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.49 Mon Dec 14 10:18:28 2020
+++ src/usr.sbin/acpitools/acpidump/acpi.c Wed Jan 20 15:27:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.49 2020/12/14 10:18:28 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.50 2021/01/20 15:27:51 skrll Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: acpi.c,v 1.49 2020/12/14 10:18:28 jmcneill Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.50 2021/01/20 15:27:51 skrll Exp $");
#include
#include
@@ -4625,11 +4625,11 @@ write_dsdt(int fd, ACPI_TABLE_HEADER *rs
/* Write out any SSDTs (if present.) */
if (rsdt != NULL) {
- ssdt = sdt_from_rsdt(rsdt, "SSDT", NULL);
+ ssdt = sdt_from_rsdt(rsdt, ACPI_SIG_SSDT, NULL);
while (ssdt != NULL) {
write(fd, ssdt + 1, ssdt->Length -
sizeof(ACPI_TABLE_HEADER));
- ssdt = sdt_from_rsdt(rsdt, "SSDT", ssdt);
+ ssdt = sdt_from_rsdt(rsdt, ACPI_SIG_SSDT, ssdt);
}
}
return (0);
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Wed Jan 20 13:22:08 UTC 2021 Modified Files: src/sys/arch/amd64/conf: GENERIC MODULAR XEN3_DOM0 XEN3_DOMU src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 src/sys/arch/i386/conf: GENERIC MODULAR XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/landisk/conf: GENERIC src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: GENERIC Log Message: remove compat_ossaudio from kernel modules this is only useful with compat_linux and gets autoloaded when compat_linux is loaded, so there's no reason to bake it into kernels any more. To generate a diff of this commit: cvs rdiff -u -r1.581 -r1.582 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/conf/MODULAR cvs rdiff -u -r1.185 -r1.186 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 cvs rdiff -u -r1.1233 -r1.1234 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/MODULAR cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.69 -r1.70 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.28 -r1.29 src/sys/arch/usermode/conf/GENERIC.common cvs rdiff -u -r1.90 -r1.91 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.581 src/sys/arch/amd64/conf/GENERIC:1.582 --- src/sys/arch/amd64/conf/GENERIC:1.581 Sat Jan 16 01:43:42 2021 +++ src/sys/arch/amd64/conf/GENERIC Wed Jan 20 13:22:08 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.581 2021/01/16 01:43:42 thorpej Exp $ +# $NetBSD: GENERIC,v 1.582 2021/01/20 13:22:08 nia 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.581 $" +#ident "GENERIC-$Revision: 1.582 $" maxusers 64 # estimated number of users @@ -178,7 +178,6 @@ include "conf/compat_netbsd15.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID -options COMPAT_OSSAUDIO options COMPAT_NETBSD32 options EXEC_ELF32 Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.18 src/sys/arch/amd64/conf/MODULAR:1.19 --- src/sys/arch/amd64/conf/MODULAR:1.18 Mon Oct 19 19:33:01 2020 +++ src/sys/arch/amd64/conf/MODULAR Wed Jan 20 13:22:08 2021 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.18 2020/10/19 19:33:01 christos Exp $ +# $NetBSD: MODULAR,v 1.19 2021/01/20 13:22:08 nia Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -26,7 +26,6 @@ include "arch/amd64/conf/GENERIC" -no options COMPAT_43 # and 4.3BSD #options COMPAT_386BSD_MBRPART # recognize old partition ID --no options COMPAT_OSSAUDIO -no options COMPAT_NETBSD32 -no options EXEC_ELF32 -no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.185 src/sys/arch/amd64/conf/XEN3_DOM0:1.186 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.185 Sun Sep 27 13:48:49 2020 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jan 20 13:22:08 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.185 2020/09/27 13:48:49 roy Exp $ +# $NetBSD: XEN3_DOM0,v 1.186 2021/01/20 13:22:08 nia Exp $ include "arch/amd64/conf/std.xen" @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.185 $" +#ident "XEN3_DOM0-$Revision: 1.186 $" maxusers 32 # estimated number of users @@ -69,7 +69,6 @@ options DDB_COMMANDONENTER="show registe include "conf/compat_netbsd15.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID -options COMPAT_OSSAUDIO options COMPAT_NETBSD32 options EXEC_ELF32 Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.96 src/sys/arch/amd64/conf/XEN3_DOMU:1.97 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.96 Sun Sep 27 13:48:49 2020 +++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Jan 20 13:22:08 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.96 2020/09/27 13:48:49 roy Exp $ +# $NetBSD: XEN3_DOMU,v 1.97 2021/01/20 13:22:08 nia Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.96 $" +#ident "XEN3_DOMU-$Revision: 1.97 $" maxusers 32 # estimated number of users @@ -59,7 +59,6 @@ options DDB_COMMANDONENTER="trace;show r include "conf/compat_netbsd15.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID -options COMPAT_OSSAUDIO options COMPAT_NETBSD32 options
CVS commit: src/sys/arch
Module Name:src Committed By: nia Date: Wed Jan 20 13:22:08 UTC 2021 Modified Files: src/sys/arch/amd64/conf: GENERIC MODULAR XEN3_DOM0 XEN3_DOMU src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 src/sys/arch/i386/conf: GENERIC MODULAR XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/landisk/conf: GENERIC src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/zaurus/conf: GENERIC Log Message: remove compat_ossaudio from kernel modules this is only useful with compat_linux and gets autoloaded when compat_linux is loaded, so there's no reason to bake it into kernels any more. To generate a diff of this commit: cvs rdiff -u -r1.581 -r1.582 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/conf/MODULAR cvs rdiff -u -r1.185 -r1.186 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 cvs rdiff -u -r1.1233 -r1.1234 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/MODULAR cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.69 -r1.70 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.28 -r1.29 src/sys/arch/usermode/conf/GENERIC.common cvs rdiff -u -r1.90 -r1.91 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/arm/sunxi
On Tue, Jan 19, 2021 at 07:19:51PM +0100, Martin Husemann wrote: > On Tue, Jan 19, 2021 at 12:35:10AM +, Jason R Thorpe wrote: > > Module Name:src > > Committed By: thorpej > > Date: Tue Jan 19 00:35:10 UTC 2021 > > > > Modified Files: > > src/sys/arch/arm/sunxi: sunxi_sramc.c > > > > Log Message: > > Use device_compatible_entry / of_search_compatible() rather than matching > > against multiple sets of compatibility strings. > > > > > > To generate a diff of this commit: > > cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_sramc.c > > This breaks cubietruck (fdt is: sun7i-a20-cubietruck.dtb): And it was fixed with $NetBSD: sunxi_sramc.c,v 1.7 2021/01/20 00:48:49 jmcneill Exp $ Martin
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Jan 20 10:26:43 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: if_tap was made mpsafe in revision 1.102 To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Jan 20 10:26:43 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: if_tap was made mpsafe in revision 1.102 To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.39 src/doc/TODO.smpnet:1.40 --- src/doc/TODO.smpnet:1.39 Sat Aug 1 08:20:47 2020 +++ src/doc/TODO.smpnet Wed Jan 20 10:26:43 2021 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.39 2020/08/01 08:20:47 maxv Exp $ +$NetBSD: TODO.smpnet,v 1.40 2021/01/20 10:26:43 nia Exp $ MP-safe components == @@ -27,6 +27,7 @@ kernel option. Some components scale up - l2tp(4) - pppoe(4) - if_spppsubr.c + - tap(4) - tun(4) - vlan(4) - Packet filters @@ -78,7 +79,6 @@ Unprotected ones - sl(4) - stf(4) - if_srt - - tap(4) - Packet filters - ipf(4) - pf(4)
