CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: uwe
Date: Sun Jan 2 23:46:21 UTC 2022
Modified Files:
src/sys/dev/wscons: wsemul_vt100.c
Log Message:
wsemul_vt100.c - make static everything that can be static
Externally, wsdisplay only needs wsemul_vt100_ops. Internally (as
vt100 emulation is split into several files) wsemul_vt100_subr.c needs
wsemul_vt100_reset().
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wscons/wsemul_vt100.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/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.48 src/sys/dev/wscons/wsemul_vt100.c:1.49
--- src/sys/dev/wscons/wsemul_vt100.c:1.48 Mon Jun 7 16:37:34 2021
+++ src/sys/dev/wscons/wsemul_vt100.c Sun Jan 2 23:46:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.48 2021/06/07 16:37:34 christos Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.49 2022/01/02 23:46:21 uwe Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.48 2021/06/07 16:37:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.49 2022/01/02 23:46:21 uwe Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsmsgattrs.h"
@@ -45,13 +45,14 @@ __KERNEL_RCSID(0, "$NetBSD: wsemul_vt100
#include
#include
-void *wsemul_vt100_cnattach(const struct wsscreen_descr *, void *,
- int, int, long);
-void *wsemul_vt100_attach(int console, const struct wsscreen_descr *,
- void *, int, int, void *, long);
-void wsemul_vt100_output(void *cookie, const u_char *data, u_int count, int);
-void wsemul_vt100_detach(void *cookie, u_int *crowp, u_int *ccolp);
-void wsemul_vt100_resetop(void *, enum wsemul_resetops);
+static void *wsemul_vt100_cnattach(const struct wsscreen_descr *, void *,
+ int, int, long);
+static void *wsemul_vt100_attach(int console, const struct wsscreen_descr *,
+ void *, int, int, void *, long);
+static void wsemul_vt100_output(void *cookie, const u_char *data, u_int count,
+int kernel);
+static void wsemul_vt100_detach(void *cookie, u_int *crowp, u_int *ccolp);
+static void wsemul_vt100_resetop(void *, enum wsemul_resetops);
#ifdef WSDISPLAY_CUSTOM_OUTPUT
static void wsemul_vt100_getmsgattrs(void *, struct wsdisplay_msgattrs *);
static void wsemul_vt100_setmsgattrs(void *, const struct wsscreen_descr *,
@@ -77,7 +78,7 @@ const struct wsemul_ops wsemul_vt100_ops
.resize = wsemul_vt100_resize
};
-struct wsemul_vt100_emuldata wsemul_vt100_console_emuldata;
+static struct wsemul_vt100_emuldata wsemul_vt100_console_emuldata;
static void wsemul_vt100_init(struct wsemul_vt100_emuldata *,
const struct wsscreen_descr *,
@@ -118,7 +119,7 @@ wsemul_vt100_output_dcs_dollar;
#define VT100_EMUL_STATE_DCS 11 /* got DCS (ESC P) */
#define VT100_EMUL_STATE_DCS_DOLLAR 12 /* got DCS$ */
-vt100_handler *vt100_output[] = {
+static vt100_handler *vt100_output[] = {
wsemul_vt100_output_esc,
wsemul_vt100_output_csi,
wsemul_vt100_output_scs94,
@@ -208,7 +209,7 @@ wsemul_vt100_init(struct wsemul_vt100_em
edp->kernattr = vd->defattr;
}
-void *
+static void *
wsemul_vt100_cnattach(const struct wsscreen_descr *type, void *cookie,
int ccol, int crow, long defattr)
{
@@ -233,7 +234,7 @@ wsemul_vt100_cnattach(const struct wsscr
return edp;
}
-void *
+static void *
wsemul_vt100_attach(int console, const struct wsscreen_descr *type,
void *cookie, int ccol, int crow, void *cbcookie, long defattr)
{
@@ -266,7 +267,7 @@ wsemul_vt100_attach(int console, const s
return edp;
}
-void
+static void
wsemul_vt100_detach(void *cookie, u_int *crowp, u_int *ccolp)
{
struct wsemul_vt100_emuldata *edp = cookie;
@@ -298,7 +299,7 @@ wsemul_vt100_resize(void * cookie, const
wsemul_vt100_resetop(cookie, WSEMUL_CLEARSCREEN);
}
-void
+static void
wsemul_vt100_resetop(void *cookie, enum wsemul_resetops op)
{
struct wsemul_vt100_emuldata *edp = cookie;
@@ -972,7 +973,7 @@ wsemul_vt100_output_csi(struct wsemul_vt
return VT100_EMUL_STATE_CSI;
}
-void
+static void
wsemul_vt100_output(void *cookie, const u_char *data, u_int count, int kernel)
{
struct wsemul_vt100_emuldata *edp = cookie;
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: uwe Date: Sun Jan 2 23:46:21 UTC 2022 Modified Files: src/sys/dev/wscons: wsemul_vt100.c Log Message: wsemul_vt100.c - make static everything that can be static Externally, wsdisplay only needs wsemul_vt100_ops. Internally (as vt100 emulation is split into several files) wsemul_vt100_subr.c needs wsemul_vt100_reset(). To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/dev/wscons/wsemul_vt100.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Jan 2 23:10:37 UTC 2022 Modified Files: src/distrib/sets/lists/debug: ad.mipseb ad.mipsel Log Message: fix pmax To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/debug/ad.mipseb \ src/distrib/sets/lists/debug/ad.mipsel Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/ad.mipseb diff -u src/distrib/sets/lists/debug/ad.mipseb:1.1 src/distrib/sets/lists/debug/ad.mipseb:1.2 --- src/distrib/sets/lists/debug/ad.mipseb:1.1 Fri Dec 31 11:15:58 2021 +++ src/distrib/sets/lists/debug/ad.mipseb Sun Jan 2 18:10:37 2022 @@ -1,4 +1,5 @@ -# $NetBSD: ad.mipseb,v 1.1 2021/12/31 16:15:58 christos Exp $ +# $NetBSD: ad.mipseb,v 1.2 2022/01/02 23:10:37 christos Exp $ +./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-ALCHEMY.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-DBAU1500.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-DBAU1550.debug comp-sysutils-debug debug Index: src/distrib/sets/lists/debug/ad.mipsel diff -u src/distrib/sets/lists/debug/ad.mipsel:1.1 src/distrib/sets/lists/debug/ad.mipsel:1.2 --- src/distrib/sets/lists/debug/ad.mipsel:1.1 Fri Dec 31 11:15:58 2021 +++ src/distrib/sets/lists/debug/ad.mipsel Sun Jan 2 18:10:37 2022 @@ -1,4 +1,5 @@ -# $NetBSD: ad.mipsel,v 1.1 2021/12/31 16:15:58 christos Exp $ +# $NetBSD: ad.mipsel,v 1.2 2022/01/02 23:10:37 christos Exp $ +./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-ALCHEMY.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-DBAU1500.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-aumac0-DBAU1550.debug comp-sysutils-debug debug @@ -7,3 +8,4 @@ ./usr/libdata/debug/netbsd-aumac0-OMSAL400.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-reth0-CPMBR1400.debug comp-sysutils-debug debug ./usr/libdata/debug/netbsd-sd0a-CPMBR1400.debug comp-sysutils-debug debug +./usr/libdata/debug/nfsnetbsd-RAMDISK.debug comp-sysutils-debug debug
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Jan 2 23:10:37 UTC 2022 Modified Files: src/distrib/sets/lists/debug: ad.mipseb ad.mipsel Log Message: fix pmax To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/debug/ad.mipseb \ src/distrib/sets/lists/debug/ad.mipsel Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Sun Jan 2 20:28:53 UTC 2022
Modified Files:
src/sys/arch/x86/x86: pmap.c
src/sys/netipsec: key.c
Log Message:
fix few more typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.413 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.272 -r1.273 src/sys/netipsec/key.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.412 src/sys/arch/x86/x86/pmap.c:1.413
--- src/sys/arch/x86/x86/pmap.c:1.412 Thu Oct 7 12:52:27 2021
+++ src/sys/arch/x86/x86/pmap.c Sun Jan 2 20:28:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.412 2021/10/07 12:52:27 msaitoh Exp $ */
+/* $NetBSD: pmap.c,v 1.413 2022/01/02 20:28:53 andvar Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.412 2021/10/07 12:52:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.413 2022/01/02 20:28:53 andvar Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -4488,7 +4488,7 @@ pmap_test_attrs(struct vm_page *pg, unsi
if (pmap_sync_pv(pvpte, pa, 0, , NULL)) {
/*
* raced with a V->P operation. wait for the other
- * side to finish by acquring pmap's lock. if no
+ * side to finish by acquiring pmap's lock. if no
* wait, updates to pp_attrs by the other side may
* go unseen.
*/
@@ -4528,7 +4528,7 @@ startover:
if (pmap_sync_pv(pvpte, pa, clearbits, , NULL)) {
/*
* raced with a V->P operation. wait for the other
- * side to finish by acquring pmap's lock. it is
+ * side to finish by acquiring pmap's lock. it is
* probably unmapping the page, and it will be gone
* when the loop is restarted.
*/
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.272 src/sys/netipsec/key.c:1.273
--- src/sys/netipsec/key.c:1.272 Fri Dec 3 13:27:39 2021
+++ src/sys/netipsec/key.c Sun Jan 2 20:28:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.272 2021/12/03 13:27:39 andvar Exp $ */
+/* $NetBSD: key.c,v 1.273 2022/01/02 20:28:53 andvar Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.272 2021/12/03 13:27:39 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.273 2022/01/02 20:28:53 andvar Exp $");
/*
* This code is referred to RFC 2367
@@ -6751,7 +6751,7 @@ key_acquire(const struct secasindex *sai
#ifndef IPSEC_NONBLOCK_ACQUIRE
/*
- * We never do anything about acquirng SA. There is anather
+ * We never do anything about acquiring SA. There is another
* solution that kernel blocks to send SADB_ACQUIRE message until
* getting something message from IKEd. In later case, to be
* managed with ACQUIRING list.
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Sun Jan 2 20:28:53 UTC 2022 Modified Files: src/sys/arch/x86/x86: pmap.c src/sys/netipsec: key.c Log Message: fix few more typos in comments. To generate a diff of this commit: cvs rdiff -u -r1.412 -r1.413 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.272 -r1.273 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Sun Jan 2 20:09:03 UTC 2022
Modified Files:
src/etc: Makefile
Log Message:
Create empty files for the "extra" kernels. Grr I should fix this properly
(run checkflists after building the kernels)
To generate a diff of this commit:
cvs rdiff -u -r1.456 -r1.457 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.456 src/etc/Makefile:1.457
--- src/etc/Makefile:1.456 Wed Dec 29 17:22:13 2021
+++ src/etc/Makefile Sun Jan 2 15:09:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.456 2021/12/29 22:22:13 christos Exp $
+# $NetBSD: Makefile,v 1.457 2022/01/02 20:09:03 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -702,6 +702,11 @@ releasekern-${configfile}: .PHONY build_
# kernels are built. It should really run before the sets are build.
install-debugkernels:
.if ${MKDEBUG:Uno} == "yes"
+ @for i in $$(${NETBSDSRCDIR}/distrib/sets/makeflist debug | \
+ ${TOOL_GREP} -E '^./usr/libdata/debug/(nfs)?netbsd-'); do \
+ echo touch ${DESTDIR}/$$i; \
+ touch ${DESTDIR}/$$i; \
+ done
. for k in ${ALL_KERNELS}
install-debugkernels: ${DESTDIR}${DEBUGDIR}/netbsd-${k}.debug
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sun Jan 2 20:09:03 UTC 2022 Modified Files: src/etc: Makefile Log Message: Create empty files for the "extra" kernels. Grr I should fix this properly (run checkflists after building the kernels) To generate a diff of this commit: cvs rdiff -u -r1.456 -r1.457 src/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: christos Date: Sun Jan 2 16:42:10 UTC 2022 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix the build. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/iyonix/iyonix/iyonix_machdep.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/iyonix/iyonix/iyonix_machdep.c diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.30 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.31 --- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.30 Sat Apr 18 07:00:41 2020 +++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sun Jan 2 11:42:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.31 2022/01/02 16:42:10 christos Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -583,7 +583,9 @@ initarm(void *arg) valloc_pages(kernelstack, UPAGES); /* Allocate enough pages for cleaning the Mini-Data cache. */ +#ifdef DIAGNOSTIC KASSERT(xscale_minidata_clean_size <= PAGE_SIZE); +#endif valloc_pages(minidataclean, 1); #ifdef VERBOSE_INIT_ARM
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: christos Date: Sun Jan 2 16:42:10 UTC 2022 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix the build. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: christos Date: Sun Jan 2 16:40:46 UTC 2022 Modified Files: src/sys/arch/zaurus/zaurus: machdep.c Log Message: fix the build (KASSERT) To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/zaurus/zaurus/machdep.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/zaurus/zaurus/machdep.c diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.48 src/sys/arch/zaurus/zaurus/machdep.c:1.49 --- src/sys/arch/zaurus/zaurus/machdep.c:1.48 Tue Aug 17 18:00:31 2021 +++ src/sys/arch/zaurus/zaurus/machdep.c Sun Jan 2 11:40:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.48 2021/08/17 22:00:31 andvar Exp $ */ +/* $NetBSD: machdep.c,v 1.49 2022/01/02 16:40:46 christos Exp $ */ /* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */ /* @@ -107,7 +107,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2021/08/17 22:00:31 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2022/01/02 16:40:46 christos Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -856,7 +856,9 @@ initarm(void *arg) valloc_pages(kernelstack, UPAGES); /* Allocate enough pages for cleaning the Mini-Data cache. */ +#ifdef DIAGNOSTIC KASSERT(xscale_minidata_clean_size <= PAGE_SIZE); +#endif valloc_pages(minidataclean, 1); #ifdef KLOADER
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: christos Date: Sun Jan 2 16:40:46 UTC 2022 Modified Files: src/sys/arch/zaurus/zaurus: machdep.c Log Message: fix the build (KASSERT) To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/zaurus/zaurus/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Jan 2 16:38:36 UTC 2022 Modified Files: src/distrib/sets/lists/debug: ad.mips Removed Files: src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el Log Message: fix part of mips To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.24 -r0 src/distrib/sets/lists/debug/ad.mips64eb cvs rdiff -u -r1.25 -r0 src/distrib/sets/lists/debug/ad.mips64el cvs rdiff -u -r1.1 -r0 src/distrib/sets/lists/debug/ad.mipsn64eb \ src/distrib/sets/lists/debug/ad.mipsn64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.80 src/distrib/sets/lists/debug/ad.mips:1.81 --- src/distrib/sets/lists/debug/ad.mips:1.80 Sun Apr 25 18:30:30 2021 +++ src/distrib/sets/lists/debug/ad.mips Sun Jan 2 11:38:36 2022 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.80 2021/04/25 22:30:30 christos Exp $ +# $NetBSD: ad.mips,v 1.81 2022/01/02 16:38:36 christos Exp $ -./usr/lib/64/libgomp_g.acomp-c-debuglib debuglib,compat,arch64 -./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug comp-c-debug obsolete -./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug comp-c-debug debug,compatfile,gcc=9 @@ -21,3 +21,9 @@ ./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat,arch64,!machine_arch=mipsn64eb,!machine_arch=mipsn64el ./usr/libdata/debug/usr/libexec/ld.elf_so-n32.debug comp-sys-debug debug,compat,arch64,!machine_arch=mips64eb,!machine_arch=mips64el ./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat,arch64 +./usr/libdata/debug/netbsd-msk0-XLSATX32.debug comp-sysutil-debug debug,arch64 +./usr/libdata/debug/netbsd-msk0-XLSATX64.debug comp-sysutil-debug debug,arch64 +./usr/libdata/debug/netbsd-sd0a-XLSATX32.debug comp-sysutil-debug debug,arch64 +./usr/libdata/debug/netbsd-sd0a-XLSATX64.debug comp-sysutil-debug debug,arch64 +./usr/libdata/debug/netbsd-wm0-XLSATX32.debug comp-sysutil-debug debug,arch64 +./usr/libdata/debug/netbsd-wm0-XLSATX64.debug comp-sysutil-debug debug,arch64
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Jan 2 16:38:36 UTC 2022 Modified Files: src/distrib/sets/lists/debug: ad.mips Removed Files: src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el Log Message: fix part of mips To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.24 -r0 src/distrib/sets/lists/debug/ad.mips64eb cvs rdiff -u -r1.25 -r0 src/distrib/sets/lists/debug/ad.mips64el cvs rdiff -u -r1.1 -r0 src/distrib/sets/lists/debug/ad.mipsn64eb \ src/distrib/sets/lists/debug/ad.mipsn64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: christos
Date: Sun Jan 2 16:03:46 UTC 2022
Modified Files:
src/sys/arch/mips/mips: mips_fixup.c
Log Message:
fix KASSERT issue
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/mips/mips_fixup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_fixup.c
diff -u src/sys/arch/mips/mips/mips_fixup.c:1.22 src/sys/arch/mips/mips/mips_fixup.c:1.23
--- src/sys/arch/mips/mips/mips_fixup.c:1.22 Sat Oct 2 10:28:04 2021
+++ src/sys/arch/mips/mips/mips_fixup.c Sun Jan 2 11:03:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fixup.c,v 1.22 2021/10/02 14:28:04 skrll Exp $ */
+/* $NetBSD: mips_fixup.c,v 1.23 2022/01/02 16:03:46 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.22 2021/10/02 14:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.23 2022/01/02 16:03:46 christos Exp $");
#include "opt_mips3_wired.h"
#include "opt_multiprocessor.h"
@@ -120,6 +120,7 @@ mips_fixup_exceptions(mips_fixup_callbac
if (addr <= load_addr
&& load_addr < addr + size
&& base == lui_reg) {
+#if defined(DIAGNOSTIC) || defined(DEBUG_VERBOSE)
KASSERT(rt == _R_K0 || rt == _R_K1);
#ifdef DEBUG_VERBOSE
printf("%s: %#x: insn %08x: %s r%zu, %%lo(%08x)(r%zu)\n",
@@ -130,6 +131,7 @@ mips_fixup_exceptions(mips_fixup_callbac
: INSN_SW_P(insn) ? "sw" : "sd",
rt, load_addr, base);
#endif
+#endif
new_insns[0] = lui_insn;
new_insns[1] = *insnp;
if ((callback)(load_addr, new_insns, arg)) {
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: christos Date: Sun Jan 2 16:03:46 UTC 2022 Modified Files: src/sys/arch/mips/mips: mips_fixup.c Log Message: fix KASSERT issue To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/mips/mips_fixup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: christos
Date: Sun Jan 2 16:03:30 UTC 2022
Modified Files:
src/sys/uvm/pmap: pmap_tlb.c
Log Message:
fix KASSERTMSG issue
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/uvm/pmap/pmap_tlb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/pmap/pmap_tlb.c
diff -u src/sys/uvm/pmap/pmap_tlb.c:1.50 src/sys/uvm/pmap/pmap_tlb.c:1.51
--- src/sys/uvm/pmap/pmap_tlb.c:1.50 Wed Dec 29 07:53:38 2021
+++ src/sys/uvm/pmap/pmap_tlb.c Sun Jan 2 11:03:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.50 2021/12/29 12:53:38 skrll Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.50 2021/12/29 12:53:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $");
/*
* Manages address spaces in a TLB.
@@ -471,9 +471,9 @@ pmap_tlb_asid_reinitialize(struct pmap_t
pmap_tlb_asid_check();
#ifdef DIAGNOSTIC
const u_int asids_count = pmap_tlb_asid_count(ti);
-#endif
KASSERTMSG(asids_found == asids_count,
"found %u != count %u", asids_found, asids_count);
+#endif
if (__predict_false(asids_found >= ti->ti_asid_max / 2)) {
tlb_invalidate_asids(KERNEL_PID + 1, ti->ti_asid_max);
#else /* MULTIPROCESSOR && !PMAP_TLB_NEED_SHOOTDOWN */
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: christos Date: Sun Jan 2 16:03:30 UTC 2022 Modified Files: src/sys/uvm/pmap: pmap_tlb.c Log Message: fix KASSERTMSG issue To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/uvm/pmap/pmap_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: riastradh
Date: Sun Jan 2 11:20:03 UTC 2022
Modified Files:
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/arm/cortex: gic.c
Log Message:
arm: Remove #ifdef DIAGNOSTIC now wrong after KASSERT change.
Objects in question aren't volatile here so access is flushable.
To generate a diff of this commit:
cvs rdiff -u -r1.431 -r1.432 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/cortex/gic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.431 src/sys/arch/arm/arm32/pmap.c:1.432
--- src/sys/arch/arm/arm32/pmap.c:1.431 Sat Jan 1 15:09:01 2022
+++ src/sys/arch/arm/arm32/pmap.c Sun Jan 2 11:20:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.431 2022/01/01 15:09:01 christos Exp $ */
+/* $NetBSD: pmap.c,v 1.432 2022/01/02 11:20:03 riastradh Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.431 2022/01/01 15:09:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.432 2022/01/02 11:20:03 riastradh Exp $");
#include
#include
@@ -3747,9 +3747,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
PMAPCOUNT(kenter_remappings);
#ifdef PMAP_CACHE_VIPT
opg = PHYS_TO_VM_PAGE(l2pte_pa(opte));
-#if !defined(ARM_MMU_EXTENDED) || defined(DIAGNOSTIC)
- struct vm_page_md *omd __diagused = VM_PAGE_TO_MD(opg);
-#endif
+ struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
if (opg && arm_cache_prefer_mask != 0) {
KASSERT(opg != pg);
KASSERT((omd->pvh_attrs & PVF_KMPAGE) == 0);
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.51 src/sys/arch/arm/cortex/gic.c:1.52
--- src/sys/arch/arm/cortex/gic.c:1.51 Thu Oct 21 04:47:57 2021
+++ src/sys/arch/arm/cortex/gic.c Sun Jan 2 11:20:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.51 2021/10/21 04:47:57 skrll Exp $ */
+/* $NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.51 2021/10/21 04:47:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $");
#include
#include
@@ -321,10 +321,8 @@ armgic_irq_handler(void *tf)
struct cpu_info * const ci = curcpu();
struct armgic_softc * const sc = _softc;
const int old_ipl = ci->ci_cpl;
-#ifdef DIAGNOSTIC
const int old_mtx_count = ci->ci_mtx_count;
const int old_l_biglocks = ci->ci_curlwp->l_biglocks;
-#endif
#ifdef DEBUG
size_t n = 0;
#endif
CVS commit: src/sys/arch/arm
Module Name:src Committed By: riastradh Date: Sun Jan 2 11:20:03 UTC 2022 Modified Files: src/sys/arch/arm/arm32: pmap.c src/sys/arch/arm/cortex: gic.c Log Message: arm: Remove #ifdef DIAGNOSTIC now wrong after KASSERT change. Objects in question aren't volatile here so access is flushable. To generate a diff of this commit: cvs rdiff -u -r1.431 -r1.432 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/cortex/gic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: riastradh Date: Sun Jan 2 11:17:39 UTC 2022 Modified Files: src/sys/arch/arm/pic: pic.c Log Message: arm: No #if DIAGNOSTIC needed any more. Compiler can (and gcc does) flush call to strlen when the result is unused, so no performance impact here. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/arm/pic/pic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/pic/pic.c diff -u src/sys/arch/arm/pic/pic.c:1.78 src/sys/arch/arm/pic/pic.c:1.79 --- src/sys/arch/arm/pic/pic.c:1.78 Tue Dec 21 07:11:02 2021 +++ src/sys/arch/arm/pic/pic.c Sun Jan 2 11:17:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pic.c,v 1.78 2021/12/21 07:11:02 skrll Exp $ */ +/* $NetBSD: pic.c,v 1.79 2022/01/02 11:17:39 riastradh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.78 2021/12/21 07:11:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.79 2022/01/02 11:17:39 riastradh Exp $"); #include #include @@ -575,9 +575,7 @@ pic_percpu_allocate(void *v0, void *v1, KASSERT(pcpu->pcpu_evs != NULL); #define PCPU_NAMELEN 32 -#ifdef DIAGNOSTIC const size_t namelen = strlen(pic->pic_name) + 4 + strlen(ci->ci_data.cpu_name); -#endif KASSERT(namelen < PCPU_NAMELEN); pcpu->pcpu_name = kmem_alloc(PCPU_NAMELEN, KM_SLEEP);
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: riastradh Date: Sun Jan 2 11:17:39 UTC 2022 Modified Files: src/sys/arch/arm/pic: pic.c Log Message: arm: No #if DIAGNOSTIC needed any more. Compiler can (and gcc does) flush call to strlen when the result is unused, so no performance impact here. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/arm/pic/pic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
