CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Thu May 23 04:44:49 UTC 2019 Modified Files: src/sys/dev/usb: usb_quirks.c Log Message: Remove extra white spaces. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/usb_quirks.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/usb
Module Name:src
Committed By: msaitoh
Date: Thu May 23 04:44:49 UTC 2019
Modified Files:
src/sys/dev/usb: usb_quirks.c
Log Message:
Remove extra white spaces. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/usb_quirks.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/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.91 src/sys/dev/usb/usb_quirks.c:1.92
--- src/sys/dev/usb/usb_quirks.c:1.91 Wed Jan 30 19:57:48 2019
+++ src/sys/dev/usb/usb_quirks.c Thu May 23 04:44:49 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.91 2019/01/30 19:57:48 jakllsch Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.92 2019/05/23 04:44:49 msaitoh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.91 2019/01/30 19:57:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.92 2019/05/23 04:44:49 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -172,7 +172,7 @@ usbd_get_desc_fake(struct usbd_device *d
UGETW(dd->idVendor), UGETW(dd->idProduct), 0, 0);
out:
DPRINTF("return err = %d", err, 0, 0, 0);
- return err;
+ return err;
}
Static const struct usbd_quirk_entry {
@@ -264,15 +264,15 @@ Static const struct usbd_quirk_entry {
{ UQ_BROKEN_BIDIR, NULL }},
{ USB_VENDOR_HP, USB_PRODUCT_HP_810C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_830C, ANY,
+ { USB_VENDOR_HP, USB_PRODUCT_HP_830C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
{ USB_VENDOR_HP, USB_PRODUCT_HP_885C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
{ USB_VENDOR_HP, USB_PRODUCT_HP_840C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_816C, ANY,
+ { USB_VENDOR_HP, USB_PRODUCT_HP_816C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
- { USB_VENDOR_HP, USB_PRODUCT_HP_959C, ANY,
+ { USB_VENDOR_HP, USB_PRODUCT_HP_959C, ANY,
{ UQ_BROKEN_BIDIR, NULL }},
{ USB_VENDOR_MTK, USB_PRODUCT_MTK_GPS_RECEIVER, ANY,
{ UQ_NO_UNION_NRM, NULL }},
CVS commit: src/doc
Module Name:src Committed By: kre Date: Thu May 23 04:37:31 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note change to comments in portal.conf for mount_portal(8). To generate a diff of this commit: cvs rdiff -u -r1.2539 -r1.2540 src/doc/CHANGES 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: kre Date: Thu May 23 04:37:31 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Note change to comments in portal.conf for mount_portal(8). To generate a diff of this commit: cvs rdiff -u -r1.2539 -r1.2540 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.2539 src/doc/CHANGES:1.2540 --- src/doc/CHANGES:1.2539 Wed May 22 17:27:41 2019 +++ src/doc/CHANGES Thu May 23 04:37:31 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2539 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2540 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -382,3 +382,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: [msaitoh 20190517] mount_9p(8): Initial support for 9P2000.u [ozaki-r 20190517] file(1): Upgraded to 5.37. [christos 20190522] + mount_portal(8): in portal.conf # only introduces a comment at + start of line, or after whitespace (start word) [kre 20190523]
CVS commit: src/sbin/mount_portal
Module Name:src Committed By: kre Date: Thu May 23 04:34:25 UTC 2019 Modified Files: src/sbin/mount_portal: conf.c mount_portal.8 Log Message: Better handling of comments in portal.conf ... # now only introduces a comment at beginning of line, or after whitespace. This allows # to be used as data otherwhere in the line (there is no escape mechanism). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_portal/conf.c cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_portal/mount_portal.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/mount_portal
Module Name:src
Committed By: kre
Date: Thu May 23 04:34:25 UTC 2019
Modified Files:
src/sbin/mount_portal: conf.c mount_portal.8
Log Message:
Better handling of comments in portal.conf ... # now only introduces
a comment at beginning of line, or after whitespace. This allows #
to be used as data otherwhere in the line (there is no escape mechanism).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_portal/conf.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_portal/mount_portal.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/mount_portal/conf.c
diff -u src/sbin/mount_portal/conf.c:1.13 src/sbin/mount_portal/conf.c:1.14
--- src/sbin/mount_portal/conf.c:1.13 Thu May 23 02:39:06 2019
+++ src/sbin/mount_portal/conf.c Thu May 23 04:34:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.13 2019/05/23 02:39:06 kre Exp $ */
+/* $NetBSD: conf.c,v 1.14 2019/05/23 04:34:25 kre Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: conf.c,v 1.13 2019/05/23 02:39:06 kre Exp $");
+__RCSID("$NetBSD: conf.c,v 1.14 2019/05/23 04:34:25 kre Exp $");
#endif /* not lint */
#include
@@ -153,21 +153,19 @@ palloc(char *cline, int lno, const char
char **ap;
/*
- * Implement comment chars
- */
- s = strchr(cline, '#');
- if (s)
- *s = 0;
-
- /*
* Do a pass through the string to count the number
- * of arguments
+ * of arguments. Stop if we encounter a comment.
*/
c = 0;
key = strdup(cline);
for (s = key; s != NULL; ) {
char *val;
+ if (*s == '#') { /* '#" at beginning of word */
+ cline[s-key] = '\0'; /* delete comment -> EOL */
+ break;
+ }
+
while ((val = strsep(&s, " \t\n")) != NULL && *val == '\0')
;
if (val)
Index: src/sbin/mount_portal/mount_portal.8
diff -u src/sbin/mount_portal/mount_portal.8:1.22 src/sbin/mount_portal/mount_portal.8:1.23
--- src/sbin/mount_portal/mount_portal.8:1.22 Mon Jul 3 21:33:41 2017
+++ src/sbin/mount_portal/mount_portal.8 Thu May 23 04:34:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount_portal.8,v 1.22 2017/07/03 21:33:41 wiz Exp $
+.\" $NetBSD: mount_portal.8,v 1.23 2019/05/23 04:34:25 kre Exp $
.\"
.\" Copyright (c) 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)mount_portal.8 8.3 (Berkeley) 3/27/94
.\"
-.Dd December 5, 2009
+.Dd May 23, 2019
.Dt MOUNT_PORTAL 8
.Os
.Sh NAME
@@ -122,7 +122,8 @@ Each rule takes one line and consists of
whitespace separated fields.
A hash
.Pq Dq #
-character causes the remainder of a line to be ignored.
+character at beginning of the line, or after whitespace,
+causes the remainder of a line to be ignored.
Blank lines are ignored.
.Pp
The first field is a pathname prefix to match
CVS commit: src/sbin/mount_portal
Module Name:src
Committed By: kre
Date: Thu May 23 02:39:06 UTC 2019
Modified Files:
src/sbin/mount_portal: conf.c
Log Message:
KNF: blank lines after declarations, return (x) -> return x, and
eliminate spaces between cast and value being cast (most were OK already)
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/mount_portal/conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_portal/conf.c
diff -u src/sbin/mount_portal/conf.c:1.12 src/sbin/mount_portal/conf.c:1.13
--- src/sbin/mount_portal/conf.c:1.12 Mon Jul 2 16:33:05 2007
+++ src/sbin/mount_portal/conf.c Thu May 23 02:39:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.12 2007/07/02 16:33:05 pooka Exp $ */
+/* $NetBSD: conf.c,v 1.13 2019/05/23 02:39:06 kre Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: conf.c,v 1.12 2007/07/02 16:33:05 pooka Exp $");
+__RCSID("$NetBSD: conf.c,v 1.13 2019/05/23 02:39:06 kre Exp $");
#endif /* not lint */
#include
@@ -109,8 +109,10 @@ static void *
xmalloc(size_t siz)
{
void *p = malloc(siz);
+
if (p)
- return (p);
+ return p;
+
syslog(LOG_ERR, "malloc: failed to get %lu bytes", (u_long)siz);
exit(1);
}
@@ -128,15 +130,16 @@ pinsert(path *p0, qelem *q0)
qelem *q;
if (p0->p_argc == 0)
- return (0);
+ return 0;
for (q = q0->q_forw; q != q0; q = q->q_forw) {
- path *p = (path *) q;
+ path *p = (path *)q;
+
if (strcmp(p->p_key, p0->p_key) == 0)
- return (0);
+ return 0;
}
ins_que(&p0->p_q, q0->q_back);
- return (1);
+ return 1;
}
@@ -164,6 +167,7 @@ palloc(char *cline, int lno, const char
key = strdup(cline);
for (s = key; s != NULL; ) {
char *val;
+
while ((val = strsep(&s, " \t\n")) != NULL && *val == '\0')
;
if (val)
@@ -173,7 +177,7 @@ palloc(char *cline, int lno, const char
free(key);
if (c <= 1)
- return (0);
+ return 0;
/*
* Now do another pass and generate a new path structure
@@ -185,6 +189,7 @@ palloc(char *cline, int lno, const char
ap = p->p_argv;
for (s = p->p_args; s != NULL; ) {
char *val;
+
while ((val = strsep(&s, " \t\n")) != NULL && *val == '\0')
;
if (val) {
@@ -215,7 +220,7 @@ palloc(char *cline, int lno, const char
}
p->p_lno = lno;
- return (p);
+ return p;
}
/*
@@ -225,10 +230,10 @@ static void
pfree(path *p)
{
free(p->p_args);
- free((char *) p->p_argv);
+ free((char *)p->p_argv);
if (p->p_use_re)
regfree(&p->p_re);
- free((char *) p);
+ free((char *)p);
}
/*
@@ -246,7 +251,7 @@ preplace(qelem *q0, qelem *xq)
while (q0->q_forw != q0) {
qelem *q = q0->q_forw;
rem_que(q);
- pfree((path *) q);
+ pfree((path *)q);
}
while (xq->q_forw != xq) {
qelem *q = xq->q_forw;
@@ -276,6 +281,7 @@ readfp(qelem *q0, FILE *fp, const char *
*/
while (fgets(cline, sizeof(cline), fp)) {
path *p = palloc(cline, nread+1, conf_file);
+
if (p && !pinsert(p, &q))
pfree(p);
nread++;
@@ -299,13 +305,14 @@ int
conf_read(qelem *q, const char *conf)
{
FILE *fp = fopen(conf, "r");
- int sverrno;
+
if (fp) {
readfp(q, fp, conf);
- (void) fclose(fp);
+ (void)fclose(fp);
return 0;
} else {
- sverrno = errno;
+ int sverrno = errno;
+
syslog(LOG_WARNING, "open config file \"%s\": %m", conf);
errno = sverrno;
return -1;
@@ -319,15 +326,16 @@ conf_match(qelem *q0, char *key)
qelem *q;
for (q = q0->q_forw; q != q0; q = q->q_forw) {
- path *p = (path *) q;
+ path *p = (path *)q;
+
if (p->p_use_re) {
if (regexec(&p->p_re, key, 0, NULL, 0) == 0)
-return (p->p_argv+1);
+return p->p_argv + 1;
} else {
if (strncmp(p->p_key, key, strlen(p->p_key)) == 0)
-return (p->p_argv+1);
+return p->p_argv + 1;
}
}
- return (0);
+ return 0;
}
CVS commit: src/sbin/mount_portal
Module Name:src Committed By: kre Date: Thu May 23 02:39:06 UTC 2019 Modified Files: src/sbin/mount_portal: conf.c Log Message: KNF: blank lines after declarations, return (x) -> return x, and eliminate spaces between cast and value being cast (most were OK already) NFCI. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sbin/mount_portal/conf.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/dts
Module Name:src
Committed By: jmcneill
Date: Wed May 22 23:22:24 UTC 2019
Modified Files:
src/sys/arch/arm/dts: rk3328-rock64.dts
Log Message:
Swap polarity of the vcc_host1_5v pin to enable USB power
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/rk3328-rock64.dts
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/dts/rk3328-rock64.dts
diff -u src/sys/arch/arm/dts/rk3328-rock64.dts:1.2 src/sys/arch/arm/dts/rk3328-rock64.dts:1.3
--- src/sys/arch/arm/dts/rk3328-rock64.dts:1.2 Tue May 21 03:42:52 2019
+++ src/sys/arch/arm/dts/rk3328-rock64.dts Wed May 22 23:22:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3328-rock64.dts,v 1.2 2019/05/21 03:42:52 mrg Exp $ */
+/* $NetBSD: rk3328-rock64.dts,v 1.3 2019/05/22 23:22:24 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -36,3 +36,7 @@
snps,dis-u2-freeclk-exists-quirk;
snps,dis_u2_susphy_quirk;
};
+
+&vcc_host1_5v {
+ /delete-property/ enable-active-high;
+};
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: jmcneill Date: Wed May 22 23:22:24 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3328-rock64.dts Log Message: Swap polarity of the vcc_host1_5v pin to enable USB power To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/rk3328-rock64.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/include
On 22.05.2019 23:35, Kamil Rytarowski wrote: > On 22.05.2019 23:25, Maya Rashish wrote: >> Module Name: src >> Committed By:maya >> Date:Wed May 22 21:25:01 UTC 2019 >> >> Modified Files: >> src/include: assert.h >> >> Log Message: >> Limit static_assert visibility to C11. >> >> The existing definition caused issues as GCC only provides _Static_assert >> when building C11 code. >> This follows the C standard: static_assert available since C11. >> >> Fixes https://rt.perl.org/Public/Bug/Display.html?id=134023 >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.22 -r1.23 src/include/assert.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/assert.h >> diff -u src/include/assert.h:1.22 src/include/assert.h:1.23 >> --- src/include/assert.h:1.22Mon Oct 3 12:08:39 2016 >> +++ src/include/assert.h Wed May 22 21:25:01 2019 >> @@ -1,4 +1,4 @@ >> -/* $NetBSD: assert.h,v 1.22 2016/10/03 12:08:39 kamil Exp $*/ >> +/* $NetBSD: assert.h,v 1.23 2019/05/22 21:25:01 maya Exp $ */ >> >> /*- >> * Copyright (c) 1992, 1993 >> @@ -105,7 +105,7 @@ void __diagassert13(const char *, int, c >> __END_DECLS >> #endif /* __ASSERT_DECLARED */ >> >> -#if ((__cplusplus - 0) < 201103L) >> +#if defined(_ISOC11_SOURCE) || (__STDC_VERSION__ - 0) >= 201101L >> #ifndef static_assert >> #define static_assert _Static_assert >> #endif /* static_assert */ >> > > We explicitly decided to not pick this Solaris-style approach in our > headers. Please revert and fix Perl. > OK, It looks like Joerg agreed with this change. It breaks the existing style of C/C++ compiler features, such as or .. but let it be. signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/include
On 22.05.2019 23:25, Maya Rashish wrote: > Module Name: src > Committed By: maya > Date: Wed May 22 21:25:01 UTC 2019 > > Modified Files: > src/include: assert.h > > Log Message: > Limit static_assert visibility to C11. > > The existing definition caused issues as GCC only provides _Static_assert > when building C11 code. > This follows the C standard: static_assert available since C11. > > Fixes https://rt.perl.org/Public/Bug/Display.html?id=134023 > > > To generate a diff of this commit: > cvs rdiff -u -r1.22 -r1.23 src/include/assert.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/assert.h > diff -u src/include/assert.h:1.22 src/include/assert.h:1.23 > --- src/include/assert.h:1.22 Mon Oct 3 12:08:39 2016 > +++ src/include/assert.h Wed May 22 21:25:01 2019 > @@ -1,4 +1,4 @@ > -/* $NetBSD: assert.h,v 1.22 2016/10/03 12:08:39 kamil Exp $*/ > +/* $NetBSD: assert.h,v 1.23 2019/05/22 21:25:01 maya Exp $ */ > > /*- > * Copyright (c) 1992, 1993 > @@ -105,7 +105,7 @@ void __diagassert13(const char *, int, c > __END_DECLS > #endif /* __ASSERT_DECLARED */ > > -#if ((__cplusplus - 0) < 201103L) > +#if defined(_ISOC11_SOURCE) || (__STDC_VERSION__ - 0) >= 201101L > #ifndef static_assert > #define static_assert _Static_assert > #endif /* static_assert */ > We explicitly decided to not pick this Solaris-style approach in our headers. Please revert and fix Perl. signature.asc Description: OpenPGP digital signature
CVS commit: src/include
Module Name:src Committed By: maya Date: Wed May 22 21:25:01 UTC 2019 Modified Files: src/include: assert.h Log Message: Limit static_assert visibility to C11. The existing definition caused issues as GCC only provides _Static_assert when building C11 code. This follows the C standard: static_assert available since C11. Fixes https://rt.perl.org/Public/Bug/Display.html?id=134023 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/include/assert.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: maya Date: Wed May 22 21:25:01 UTC 2019 Modified Files: src/include: assert.h Log Message: Limit static_assert visibility to C11. The existing definition caused issues as GCC only provides _Static_assert when building C11 code. This follows the C standard: static_assert available since C11. Fixes https://rt.perl.org/Public/Bug/Display.html?id=134023 To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/include/assert.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/assert.h diff -u src/include/assert.h:1.22 src/include/assert.h:1.23 --- src/include/assert.h:1.22 Mon Oct 3 12:08:39 2016 +++ src/include/assert.h Wed May 22 21:25:01 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: assert.h,v 1.22 2016/10/03 12:08:39 kamil Exp $ */ +/* $NetBSD: assert.h,v 1.23 2019/05/22 21:25:01 maya Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -105,7 +105,7 @@ void __diagassert13(const char *, int, c __END_DECLS #endif /* __ASSERT_DECLARED */ -#if ((__cplusplus - 0) < 201103L) +#if defined(_ISOC11_SOURCE) || (__STDC_VERSION__ - 0) >= 201101L #ifndef static_assert #define static_assert _Static_assert #endif /* static_assert */
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed May 22 17:27:41 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new file(1) To generate a diff of this commit: cvs rdiff -u -r1.1620 -r1.1621 src/doc/3RDPARTY cvs rdiff -u -r1.2538 -r1.2539 src/doc/CHANGES 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: christos Date: Wed May 22 17:27:41 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new file(1) To generate a diff of this commit: cvs rdiff -u -r1.1620 -r1.1621 src/doc/3RDPARTY cvs rdiff -u -r1.2538 -r1.2539 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1620 src/doc/3RDPARTY:1.1621 --- src/doc/3RDPARTY:1.1620 Mon May 13 05:21:06 2019 +++ src/doc/3RDPARTY Wed May 22 13:27:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1620 2019/05/13 09:21:06 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1621 2019/05/22 17:27:41 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -410,13 +410,13 @@ Notes: Please use "expat" as the vendor tag for CVS imports. Package: file -Version: 5.35 -Current Vers: 5.35 +Version: 5.37 +Current Vers: 5.37 Maintainer: Christos Zoulas Archive Site: ftp://ftp.astron.com/pub/file/ Home Page: http://www.darwinsys.com/file/ -Date: 2019-01-09 -Mailing List: f...@mx.gw.com +Date: 2019-05-22 +Mailing List: f...@astron.com Responsible: christos, pooka License: BSD (2-clause) Location: external/bsd/file/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2538 src/doc/CHANGES:1.2539 --- src/doc/CHANGES:1.2538 Tue May 21 22:25:28 2019 +++ src/doc/CHANGES Wed May 22 13:27:41 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2538 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2539 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -381,3 +381,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: ifmedia(4): Extend Ethernet's ifmedia word's subword up to 255. [msaitoh 20190517] mount_9p(8): Initial support for 9P2000.u [ozaki-r 20190517] + file(1): Upgraded to 5.37. [christos 20190522]
CVS commit: src/external/bsd/file
Module Name:src Committed By: christos Date: Wed May 22 17:26:05 UTC 2019 Modified Files: src/external/bsd/file/dist: ChangeLog config.h.in configure configure.ac src/external/bsd/file/dist/doc: file.1 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: apple archive elf filesystems geo kml netbsd pgp src/external/bsd/file/dist/src: apprentice.c cdf.c cdf_time.c compress.c der.c encoding.c file.c file.h fsmagic.c funcs.c is_json.c magic.c print.c readcdf.c readelf.c softmagic.c src/external/bsd/file/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/config.h.in cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/configure cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/magic/magdir/apple cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.14 -r1.15 \ src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/geo cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/file/dist/magic/magdir/kml cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/netbsd cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/pgp cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/cdf.c \ src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/cdf_time.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/der.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/encoding.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/file.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/fsmagic.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/funcs.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/is_json.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/magic.c \ src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/readcdf.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Wed May 22 17:19:59 UTC 2019 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7695 Log Message: 2019-05-14 22:26 Christos Zoulas * release 5.37 2019-05-09 22:27 Christos Zoulas * Make sure that continuation separators are printed with -k within softmagic 2019-05-06 22:27 Christos Zoulas * Change SIGPIPE saving and restoring during compression to use sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko) * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko) 2019-05-06 17:25 Christos Zoulas * PR/77: Handle --mime-type and -k correctly. 2019-05-03 15:26 Christos Zoulas * Switch decompression code to use vfork() because tools like rpmdiff and rpmbuild call libmagic with large process footprints (Denys Vlasenko) 2019-04-07 14:05 Christos Zoulas * PR/75: --enable-zlib, did not work. 2019-02-27 11:54 Christos Zoulas * Improve regex efficiency (Michael Schroeder) by: 1. Prefixing regex searches with regular search for keywords where possible 2. Using memmem(3) where available Status: Vendor Tag: CHRISTOS Release Tags: FILE5_37 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/acinclude.m4 C src/external/bsd/file/dist/configure.ac U src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING C src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/README U src/external/bsd/file/dist/TODO U src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/depcomp U src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh U src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/getopt_long.c U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/dprintf.c U src/external/bsd/file/dist/src/fmtcheck.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/localtime_r.c U src/external/bsd/file/dist/src/gmtime_r.c U src/external/bsd/file/dist/src/strcasestr.c U src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c U src/external/bsd/file/dist/src/buffer.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c C src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/compress.c C src/external/bsd/file/dist/src/is_json.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/apptype.c C src/external/bsd/file/dist/src/der.c U src/external/bsd/file/dist/src/der.h U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h C src/external/bsd/file/dist/src/cdf.c C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h C src/external/bsd/file/dist/src/file.c U src/external/bsd/file/dist/src/seccomp.c U src/external/bsd/file/dist/src/magic.h.in C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/algol68 U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dis
CVS import: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Wed May 22 17:19:59 UTC 2019 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7695 Log Message: 2019-05-14 22:26 Christos Zoulas * release 5.37 2019-05-09 22:27 Christos Zoulas * Make sure that continuation separators are printed with -k within softmagic 2019-05-06 22:27 Christos Zoulas * Change SIGPIPE saving and restoring during compression to use sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko) * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko) 2019-05-06 17:25 Christos Zoulas * PR/77: Handle --mime-type and -k correctly. 2019-05-03 15:26 Christos Zoulas * Switch decompression code to use vfork() because tools like rpmdiff and rpmbuild call libmagic with large process footprints (Denys Vlasenko) 2019-04-07 14:05 Christos Zoulas * PR/75: --enable-zlib, did not work. 2019-02-27 11:54 Christos Zoulas * Improve regex efficiency (Michael Schroeder) by: 1. Prefixing regex searches with regular search for keywords where possible 2. Using memmem(3) where available Status: Vendor Tag: CHRISTOS Release Tags: FILE5_37 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/acinclude.m4 C src/external/bsd/file/dist/configure.ac U src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING C src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/README U src/external/bsd/file/dist/TODO U src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/depcomp U src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh U src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/getopt_long.c U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/dprintf.c U src/external/bsd/file/dist/src/fmtcheck.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/localtime_r.c U src/external/bsd/file/dist/src/gmtime_r.c U src/external/bsd/file/dist/src/strcasestr.c U src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c U src/external/bsd/file/dist/src/buffer.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c C src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/compress.c C src/external/bsd/file/dist/src/is_json.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/apptype.c C src/external/bsd/file/dist/src/der.c U src/external/bsd/file/dist/src/der.h U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h C src/external/bsd/file/dist/src/cdf.c C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h C src/external/bsd/file/dist/src/file.c U src/external/bsd/file/dist/src/seccomp.c U src/external/bsd/file/dist/src/magic.h.in C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/algol68 U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dis
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed May 22 15:34:26 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: LOCKDEBUG kernels should work now. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed May 22 15:34:26 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: LOCKDEBUG kernels should work now. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.6 src/sys/arch/ia64/TODO:1.7 --- src/sys/arch/ia64/TODO:1.6 Sun May 5 16:45:34 2019 +++ src/sys/arch/ia64/TODO Wed May 22 15:34:26 2019 @@ -28,7 +28,6 @@ Tasks remaining: originally written by one of ia64 gurus but still looks maintained and portable 4) something else -- kernel with LOCKDEBUG option crashes in pmap startup somewhere - redo _regset.h in netbsd style with __greg_t __gregset_t - implement ld.elf_so, MK_DYNAMICROOT - fix memory detection, on real hardware doesn't find all memory
CVS commit: src/sys/kern
Module Name:src Committed By: scole Date: Wed May 22 15:32:14 UTC 2019 Modified Files: src/sys/kern: subr_lockdebug.c Log Message: Increase LD_BATCH_SHIFT for ia64 LOCKDEBUG kernels. Otherwise, ia64 pmap will run out of space with this kernel debug option enabled. Discussed with over email. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/kern/subr_lockdebug.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/subr_lockdebug.c diff -u src/sys/kern/subr_lockdebug.c:1.70 src/sys/kern/subr_lockdebug.c:1.71 --- src/sys/kern/subr_lockdebug.c:1.70 Thu May 9 05:00:31 2019 +++ src/sys/kern/subr_lockdebug.c Wed May 22 15:32:14 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_lockdebug.c,v 1.70 2019/05/09 05:00:31 ozaki-r Exp $ */ +/* $NetBSD: subr_lockdebug.c,v 1.71 2019/05/22 15:32:14 scole Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.70 2019/05/09 05:00:31 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.71 2019/05/22 15:32:14 scole Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -59,7 +59,11 @@ unsigned int ld_panic; #ifdef LOCKDEBUG +#ifdef __ia64__ +#define LD_BATCH_SHIFT 16 +#else #define LD_BATCH_SHIFT 9 +#endif #define LD_BATCH (1 << LD_BATCH_SHIFT) #define LD_BATCH_MASK (LD_BATCH - 1) #define LD_MAX_LOCKS 1048576
CVS commit: src/sys/kern
Module Name:src Committed By: scole Date: Wed May 22 15:32:14 UTC 2019 Modified Files: src/sys/kern: subr_lockdebug.c Log Message: Increase LD_BATCH_SHIFT for ia64 LOCKDEBUG kernels. Otherwise, ia64 pmap will run out of space with this kernel debug option enabled. Discussed with over email. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/kern/subr_lockdebug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed May 22 15:17:48 UTC 2019 Modified Files: src/share/man/man4: options.4 Log Message: filesystem -> file system To generate a diff of this commit: cvs rdiff -u -r1.505 -r1.506 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed May 22 15:17:48 UTC 2019 Modified Files: src/share/man/man4: options.4 Log Message: filesystem -> file system To generate a diff of this commit: cvs rdiff -u -r1.505 -r1.506 src/share/man/man4/options.4 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/man4/options.4 diff -u src/share/man/man4/options.4:1.505 src/share/man/man4/options.4:1.506 --- src/share/man/man4/options.4:1.505 Tue May 21 22:34:13 2019 +++ src/share/man/man4/options.4 Wed May 22 15:17:48 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.505 2019/05/21 22:34:13 sevan Exp $ +.\" $NetBSD: options.4,v 1.506 2019/05/22 15:17:48 wiz Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -1061,7 +1061,7 @@ emulation for Linux binaries is required .Ss Options for FFS/UFS File Systems .Bl -ohang .It Cd options APPLE_UFS -Enable support for UFS filesystems created on Mac OS X. +Enable support for UFS file systems created on Mac OS X. .It Cd options FFS_EI Enable .Dq Endian-Independent
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Wed May 22 15:10:13 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: db_trace.c Log Message: Add missing include to fix the crash(8) build, from Tobias Ulmer, PR port-sparc64/54221 To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/sparc64/db_trace.c diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.52 src/sys/arch/sparc64/sparc64/db_trace.c:1.53 --- src/sys/arch/sparc64/sparc64/db_trace.c:1.52 Wed May 22 07:40:09 2019 +++ src/sys/arch/sparc64/sparc64/db_trace.c Wed May 22 15:10:13 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.52 2019/05/22 07:40:09 martin Exp $ */ +/* $NetBSD: db_trace.c,v 1.53 2019/05/22 15:10:13 martin Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.52 2019/05/22 07:40:09 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.53 2019/05/22 15:10:13 martin Exp $"); #include #include @@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v #include #include #include +#include #include #include
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Wed May 22 15:10:13 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: db_trace.c Log Message: Add missing include to fix the crash(8) build, from Tobias Ulmer, PR port-sparc64/54221 To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/sparc64
Oh, should've tested that. Survived kernels and distribution: diff --git a/sys/arch/sparc64/sparc64/db_trace.c b/sys/arch/sparc64/sparc64/db_trace.c index f5e35e79dd51..d94e5eb2d2ef 100644 --- a/sys/arch/sparc64/sparc64/db_trace.c +++ b/sys/arch/sparc64/sparc64/db_trace.c @@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.52 2019/05/22 07:40:09 martin Exp $") #include #include #include +#include #include #include On Wed, May 22, 2019 at 03:02:13PM +0200, J. Hannken-Illjes wrote: > This breaks the build of usr.sbin/crash: > > /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c: In > function 'db_stack_trace_print': > /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c:166:37: > error: 'VM_MAX_KERNEL_ADDRESS' undeclared (first use in this function); did > you mean 'VM_MAXADDRESS'? > if (frame < KERNBASE || frame >= VM_MAX_KERNEL_ADDRESS) > ^ > VM_MAXADDRESS > /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c:166:37: > note: each undeclared identifier is reported only once for each function it > appears in > > -- > J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig > > > On 22. May 2019, at 09:40, Martin Husemann wrote: > > > > Module Name:src > > Committed By: martin > > Date: Wed May 22 07:40:09 UTC 2019 > > > > Modified Files: > > src/sys/arch/sparc64/sparc64: db_trace.c > > > > Log Message: > > Fix previous and use the original patch from PR port-sparc64/54221 > > instead (XXX should fix comments in param.h) > > > > > > To generate a diff of this commit: > > cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/sparc64
This breaks the build of usr.sbin/crash: /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c: In function 'db_stack_trace_print': /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c:166:37: error: 'VM_MAX_KERNEL_ADDRESS' undeclared (first use in this function); did you mean 'VM_MAXADDRESS'? if (frame < KERNBASE || frame >= VM_MAX_KERNEL_ADDRESS) ^ VM_MAXADDRESS /work/build/src/usr.sbin/crash/../../sys/arch/sparc64/sparc64/db_trace.c:166:37: note: each undeclared identifier is reported only once for each function it appears in -- J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig > On 22. May 2019, at 09:40, Martin Husemann wrote: > > Module Name: src > Committed By: martin > Date: Wed May 22 07:40:09 UTC 2019 > > Modified Files: > src/sys/arch/sparc64/sparc64: db_trace.c > > Log Message: > Fix previous and use the original patch from PR port-sparc64/54221 > instead (XXX should fix comments in param.h) > > > To generate a diff of this commit: > cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/sparc64/db_trace.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. > signature.asc Description: Message signed with OpenPGP
Re: audio2
At Tue, 21 May 2019 10:34:37 -0300 (ADT), Jared McNeill wrote: > > You are correct, my mistake! No problem, thank you. --- Tetsuya Isaki > On Tue, 21 May 2019, Tetsuya Isaki wrote: > > > At Thu, 9 May 2019 10:28:19 -0300 (ADT), > > Jared McNeill wrote: > >> With order of operations here, and track->volume being in range 0...256, I > >> don't think this will work anyway. volume of 255 of less will cause the > >> sample to be 0, and 256 the original value. > > > > (A * B >> C) is equivalent to ((A * B) >> C). > > (A * B / C) is equivalent to ((A * B) / C). > > And in fact it worked. > > > > # I'm sorry if I misread your text. > > > > Thanks, > > --- > > Tetsuya Isaki > > > >>> 5234:#if defined(AUDIO_USE_C_IMPLEMENTATION_DEFINED_BEHAVIOR) && > >>> defined(__GNUC__) > >>> 5235- *d++ += ((aint2_t)*s++) * track->volume > >>> >> 8; > >>> 5236-#else > >>> 5237- *d++ += ((aint2_t)*s++) * track->volume > >>> / 256; > >>> 5238-#endif > > >
CVS commit: src
Module Name:src
Committed By: hannken
Date: Wed May 22 08:47:02 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zvol.c
src/sys/kern: subr_disk.c subr_iostat.c
src/sys/sys: disk.h iostat.h
Log Message:
Implement disk_rename()/iostat_rename() to rename a disk.
Use it from zvol_rename_minor() when renaming a ZVOL.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
cvs rdiff -u -r1.127 -r1.128 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/subr_iostat.c
cvs rdiff -u -r1.73 -r1.74 src/sys/sys/disk.h
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/iostat.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.11 src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.12
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.11 Wed May 22 08:46:27 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c Wed May 22 08:47:02 2019
@@ -3270,7 +3270,9 @@ zvol_rename_minor(zvol_state_t *zv, cons
PNBUF_PUT(nm);
strlcpy(zv->zv_name, newname, sizeof(zv->zv_name));
- /* XXX Update dk_name? */
+ mutex_enter(&zv->zv_dklock);
+ disk_rename(&zv->zv_dk, zv->zv_name);
+ mutex_exit(&zv->zv_dklock);
}
#endif
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.127 src/sys/kern/subr_disk.c:1.128
--- src/sys/kern/subr_disk.c:1.127 Thu Apr 4 20:19:07 2019
+++ src/sys/kern/subr_disk.c Wed May 22 08:47:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.127 2019/04/04 20:19:07 christos Exp $ */
+/* $NetBSD: subr_disk.c,v 1.128 2019/05/22 08:47:02 hannken Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.127 2019/04/04 20:19:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.128 2019/05/22 08:47:02 hannken Exp $");
#include
#include
@@ -199,6 +199,17 @@ disk_init(struct disk *diskp, const char
}
/*
+ * Rename a disk.
+ */
+void
+disk_rename(struct disk *diskp, const char *name)
+{
+
+ diskp->dk_name = name;
+ iostat_rename(diskp->dk_stats, diskp->dk_name);
+}
+
+/*
* Attach a disk.
*/
void
Index: src/sys/kern/subr_iostat.c
diff -u src/sys/kern/subr_iostat.c:1.24 src/sys/kern/subr_iostat.c:1.25
--- src/sys/kern/subr_iostat.c:1.24 Mon Sep 3 16:29:35 2018
+++ src/sys/kern/subr_iostat.c Wed May 22 08:47:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_iostat.c,v 1.24 2018/09/03 16:29:35 riastradh Exp $ */
+/* $NetBSD: subr_iostat.c,v 1.25 2019/05/22 08:47:02 hannken Exp $ */
/* NetBSD: subr_disk.c,v 1.69 2005/05/29 22:24:15 christos Exp */
/*-
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_iostat.c,v 1.24 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_iostat.c,v 1.25 2019/05/22 08:47:02 hannken Exp $");
#include
#include
@@ -180,6 +180,18 @@ iostat_free(struct io_stats *stats)
}
/*
+ * Rename i/o stats.
+ */
+void
+iostat_rename(struct io_stats *stats, const char *name)
+{
+
+ rw_enter(&iostatlist_lock, RW_WRITER);
+ (void)strlcpy(stats->io_name, name, sizeof(stats->io_name));
+ rw_exit(&iostatlist_lock);
+}
+
+/*
* multiply timeval by unsigned integer and add to result
*/
static void
Index: src/sys/sys/disk.h
diff -u src/sys/sys/disk.h:1.73 src/sys/sys/disk.h:1.74
--- src/sys/sys/disk.h:1.73 Tue Nov 6 04:04:34 2018
+++ src/sys/sys/disk.h Wed May 22 08:47:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.h,v 1.73 2018/11/06 04:04:34 mrg Exp $ */
+/* $NetBSD: disk.h,v 1.74 2019/05/22 08:47:02 hannken Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@@ -527,6 +527,7 @@ extern int disk_count; /* number of di
struct proc;
+void disk_rename(struct disk *, const char *);
void disk_attach(struct disk *);
int disk_begindetach(struct disk *, int (*)(device_t), device_t, int);
void disk_detach(struct disk *);
Index: src/sys/sys/iostat.h
diff -u src/sys/sys/iostat.h:1.11 src/sys/sys/iostat.h:1.12
--- src/sys/sys/iostat.h:1.11 Sun Mar 5 23:07:12 2017
+++ src/sys/sys/iostat.h Wed May 22 08:47:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: iostat.h,v 1.11 2017/03/05 23:07:12 mlelstv Exp $ */
+/* $NetBSD: iostat.h,v 1.12 2019/05/22 08:47:02 hannken Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004, 2009 The NetBSD Foundation, Inc.
@@ -121,6 +121,7 @@ bool iostat_isbusy(struct io_stats *);
struct io_stats *iostat_find(const char *);
struct io_stats *iostat_alloc(int32_t, void *, const char *);
void iostat_free(struct io_stats *);
+void iostat_rename(struct io_stats *, const char *);
void iostat_seek(struct io_stats *);
#endif
CVS commit: src
Module Name:src Committed By: hannken Date: Wed May 22 08:47:02 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zvol.c src/sys/kern: subr_disk.c subr_iostat.c src/sys/sys: disk.h iostat.h Log Message: Implement disk_rename()/iostat_rename() to rename a disk. Use it from zvol_rename_minor() when renaming a ZVOL. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c cvs rdiff -u -r1.127 -r1.128 src/sys/kern/subr_disk.c cvs rdiff -u -r1.24 -r1.25 src/sys/kern/subr_iostat.c cvs rdiff -u -r1.73 -r1.74 src/sys/sys/disk.h cvs rdiff -u -r1.11 -r1.12 src/sys/sys/iostat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Wed May 22 08:46:27 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c zvol.c
Log Message:
Add missing zvol_close() to zfsdev_close().
Change zvol_size_changed() to initialize "zv->zv_volsize"
and initialize only "dg_secsize" and "dg_secperunit".
Calling disk_set_info() will initialize the remaining
parts of the geometry.
Set "doread" in zvol_strategy() to make reading from
device possible.
Reorganize/add disk_busy()/disk_unbusy() instrumentation.
Redo zvol_ioctl() to implement DIOCGWEDGEINFO and let
disk_ioctl() process the remaining ioctls.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.19 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.20
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.19 Wed May 22 08:45:32 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Wed May 22 08:46:27 2019
@@ -6285,6 +6285,7 @@ zfsdev_close(dev_t dev, int flag, int ot
#ifdef __FreeBSD__
return;
#else
+ return zvol_close(dev, flag, otyp, cr);
return 0;
#endif
}
@@ -6303,7 +6304,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zc
#endif
#ifdef __NetBSD__
static int
-zfsdev_ioctl(dev_t dev, int zcmd, intptr_t iarg, int flag, cred_t *cr, int *rvalp)
+zfsdev_ioctl(dev_t dev, u_long zcmd, intptr_t iarg, int flag, cred_t *cr, int *rvalp)
#endif
{
zfs_cmd_t *zc;
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.11
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.10 Wed May 22 08:45:32 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c Wed May 22 08:46:27 2019
@@ -315,29 +315,14 @@ zvol_size_changed(zvol_state_t *zv, uint
}
#endif /* __FreeBSD__ */
#ifdef __NetBSD__
- prop_dictionary_t disk_info, odisk_info, geom;
- struct disk *disk;
+ struct disk_geom *dg = &zv->zv_dk.dk_geom;
- disk = &zv->zv_dk;
+ zv->zv_volsize = volsize;
- disk_info = prop_dictionary_create();
- geom = prop_dictionary_create();
-
- prop_dictionary_set_cstring_nocopy(disk_info, "type", "ESDI");
- prop_dictionary_set_uint64(geom, "sectors-per-unit", zv->zv_volsize);
- prop_dictionary_set_uint32(geom, "sector-size",
- DEV_BSIZE /* XXX 512? */);
- prop_dictionary_set_uint32(geom, "sectors-per-track", 32);
- prop_dictionary_set_uint32(geom, "tracks-per-cylinder", 64);
- prop_dictionary_set_uint32(geom, "cylinders-per-unit", zv->zv_volsize / 2048);
- prop_dictionary_set(disk_info, "geometry", geom);
- prop_object_release(geom);
-
- odisk_info = disk->dk_info;
- disk->dk_info = disk_info;
-
- if (odisk_info != NULL)
- prop_object_release(odisk_info);
+ memset(dg, 0, sizeof(*dg));
+ dg->dg_secsize = DEV_BSIZE; /* XXX 512? */
+ dg->dg_secperunit = zv->zv_volsize / dg->dg_secsize;;
+ disk_set_info(NULL, &zv->zv_dk, "ZVOL");
#endif
}
@@ -1793,7 +1778,7 @@ zvol_strategy(buf_t *bp)
objset_t *os;
rl_t *rl;
int error = 0;
-#ifdef illumos
+#if defined(illumos) || defined(__NetBSD__)
boolean_t doread = bp->b_flags & B_READ;
#else
boolean_t doread = 0;
@@ -2136,6 +2121,12 @@ zvol_read(struct cdev *dev, struct uio *
}
#endif
+#ifdef __NetBSD__
+ uint64_t resid = uio->uio_resid;
+ mutex_enter(&zv->zv_dklock);
+ disk_busy(&zv->zv_dk);
+ mutex_exit(&zv->zv_dklock);
+#endif
rl = zfs_range_lock(&zv->zv_znode, uio->uio_loffset, uio->uio_resid,
RL_READER);
while (uio->uio_resid > 0 && uio->uio_loffset < volsize) {
@@ -2154,6 +2145,11 @@ zvol_read(struct cdev *dev, struct uio *
}
}
zfs_range_unlock(rl);
+#ifdef __NetBSD__
+ mutex_enter(&zv->zv_dklock);
+ disk_unbusy(&zv->zv_dk, resid - uio->uio_resid, 1);
+ mutex_exit(&zv->zv_dklock);
+#endif
return (error);
}
@@ -2205,6 +2201,12 @@ zvol_write(struct cdev *dev, struct uio
#endif
(zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS);
+#ifdef __NetBSD__
+ uint64_t resid = uio->uio_resid;
+ mutex_enter(&zv->zv_dklock);
+ disk_busy(&zv->zv_dk);
+ mutex_exit(&zv->zv_dklock);
+#endif
rl = zfs_range_lock(&zv->zv_znode, uio->uio_loffset, uio->uio_resid,
RL_WRITER);
while (uio->uio_resid > 0 && uio->uio_loffset < volsize) {
@@ -2232,6 +2234,11 @@ zvol_write(struct cdev *dev, struct uio
zfs_range_unlock(rl);
if (sync)
zil_commit(zv->zv_zilog, ZVOL_OBJ);
+#ifdef __NetBSD__
+ mutex_enter(&zv->zv_dklock);
+ disk_unbusy(&zv->zv_dk, resid - uio->uio_resid, 0);
+ mutex_exit(&zv->zv_dklock);
+#endif
return (error);
}
@@ -3568,42 +3575
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Wed May 22 08:46:27 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c zvol.c Log Message: Add missing zvol_close() to zfsdev_close(). Change zvol_size_changed() to initialize "zv->zv_volsize" and initialize only "dg_secsize" and "dg_secperunit". Calling disk_set_info() will initialize the remaining parts of the geometry. Set "doread" in zvol_strategy() to make reading from device possible. Reorganize/add disk_busy()/disk_unbusy() instrumentation. Redo zvol_ioctl() to implement DIOCGWEDGEINFO and let disk_ioctl() process the remaining ioctls. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c cvs rdiff -u -r1.10 -r1.11 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Wed May 22 08:45:32 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: dsl_dataset.c dsl_dir.c spa.c zfs_ioctl.c zfs_vfsops.c zvol.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zvol.h Log Message: Enable the zvol minor management to create and remove device nodes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c cvs rdiff -u -r1.18 -r1.19 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c cvs rdiff -u -r1.22 -r1.23 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zvol.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: hannken
Date: Wed May 22 08:45:32 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dsl_dataset.c dsl_dir.c
spa.c zfs_ioctl.c zfs_vfsops.c zvol.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zvol.h
Log Message:
Enable the zvol minor management to create and remove device nodes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
cvs rdiff -u -r1.22 -r1.23 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zvol.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.3 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c Wed May 22 08:45:32 2019
@@ -1612,7 +1612,7 @@ dsl_dataset_snapshot(nvlist_t *snaps, nv
fnvlist_free(suspended);
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef _KERNEL
if (error == 0) {
for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
@@ -2164,7 +2164,7 @@ static int
dsl_dataset_rename_snapshot_sync_impl(dsl_pool_t *dp,
dsl_dataset_t *hds, void *arg)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef _KERNEL
char *oldname, *newname;
#endif
@@ -2197,7 +2197,7 @@ dsl_dataset_rename_snapshot_sync_impl(ds
dsl_dataset_phys(hds)->ds_snapnames_zapobj,
ds->ds_snapname, 8, 1, &ds->ds_object, tx));
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef _KERNEL
oldname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
newname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
@@ -2640,7 +2640,7 @@ dsl_dataset_promote_sync(void *arg, dmu_
dsl_dir_t *odd = NULL;
uint64_t oldnext_obj;
int64_t delta;
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(_KERNEL)
char *oldname, *newname;
#endif
@@ -2710,7 +2710,7 @@ dsl_dataset_promote_sync(void *arg, dmu_
dsl_dir_phys(dd)->dd_clones, origin_head->ds_object, tx));
}
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(_KERNEL)
/* Take the spa_namespace_lock early so zvol renames don't deadlock. */
mutex_enter(&spa_namespace_lock);
@@ -2752,7 +2752,7 @@ dsl_dataset_promote_sync(void *arg, dmu_
VERIFY0(dsl_dir_hold_obj(dp, dd->dd_object,
NULL, ds, &ds->ds_dir));
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(_KERNEL)
dsl_dataset_name(ds, newname);
zfsvfs_update_fromname(oldname, newname);
zvol_rename_minors(oldname, newname);
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c:1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c:1.3
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c:1.2 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c Wed May 22 08:45:32 2019
@@ -1912,7 +1912,7 @@ dsl_dir_rename_sync(void *arg, dmu_tx_t
VERIFY0(zap_add(mos, dsl_dir_phys(newparent)->dd_child_dir_zapobj,
dd->dd_myname, 8, 1, &dd->dd_object, tx));
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef _KERNEL
zfsvfs_update_fromname(ddra->ddra_oldname, ddra->ddra_newname);
zvol_rename_minors(ddra->ddra_oldname, ddra->ddra_newname);
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.9
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.8 Tue May 7 08:49:59 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c Wed May 22 08:45:32 2019
@@ -3226,7 +3226,7 @@ spa_open_common(const char *pool, spa_t
spa->spa_last_ubsync_txg = 0;
spa->spa_load_txg = 0;
mutex_exit(&spa_namespace_lock);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
#ifdef _KERNEL
if (firstopen)
zvol_create_minors(spa->spa_name);
@@ -4508,7 +4508,7 @@ spa_import(const char *pool, nvlist_t *c
mutex_exit(&spa_namespace_lock);
-#ifdef __FreeBSD__
+#if defined(__Fr
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: hannken Date: Wed May 22 08:44:49 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c zvol.c src/external/cddl/osnet/sys/kern: ddi.c src/external/cddl/osnet/sys/sys: sunddi.h Log Message: Update ddi environment: - Put device major numbers into "dev_info_t". - Fix an off-by-one in zvol_create_minor(). - When creating a node handle existing nodes and add owner read/write permission. - When removing nodes remove now empty directories. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c cvs rdiff -u -r1.8 -r1.9 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/kern/ddi.c cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/sunddi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: hannken
Date: Wed May 22 08:44:49 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c zvol.c
src/external/cddl/osnet/sys/kern: ddi.c
src/external/cddl/osnet/sys/sys: sunddi.h
Log Message:
Update ddi environment:
- Put device major numbers into "dev_info_t".
- Fix an off-by-one in zvol_create_minor().
- When creating a node handle existing nodes
and add owner read/write permission.
- When removing nodes remove now empty directories.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/kern/ddi.c
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/sys/sunddi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.17 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.18
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.17 Tue May 7 08:51:09 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Wed May 22 08:44:48 2019
@@ -211,11 +211,8 @@ static struct cdev *zfsdev;
#endif
#ifdef __NetBSD__
-static int zfs_cmajor = -1;
-static int zfs_bmajor = -1;
-dev_info_t *zfs_dip;
-
-#define ddi_driver_major(x) zfs_cmajor
+static dev_info_t __zfs_devinfo = { -1, -1 };
+dev_info_t *zfs_dip = &__zfs_devinfo;
#define zfs_init() /* nothing */
#define zfs_fini() /* nothing */
@@ -7204,8 +7201,8 @@ zfs_modcmd(modcmd_t cmd, void *arg)
zfs_ioctl_init();
zfs_sysctl_init();
- error = devsw_attach("zfs", &zfs_bdevsw, &zfs_bmajor,
- &zfs_cdevsw, &zfs_cmajor);
+ error = devsw_attach("zfs", &zfs_bdevsw, &zfs_dip->di_bmajor,
+ &zfs_cdevsw, &zfs_dip->di_cmajor);
if (error != 0) {
goto attacherr;
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.9
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c:1.8 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c Wed May 22 08:44:48 2019
@@ -676,7 +676,7 @@ zvol_create_minor(const char *name)
minor_t minor = 0;
vnode_t *vp = NULL;
char *devpath;
- size_t devpathlen = strlen(ZVOL_FULL_DEV_DIR) + strlen(name) + 1;
+ size_t devpathlen = strlen(ZVOL_FULL_DEV_DIR) + strlen(name) + 2;
#endif
mutex_enter(&zfsdev_state_lock);
Index: src/external/cddl/osnet/sys/kern/ddi.c
diff -u src/external/cddl/osnet/sys/kern/ddi.c:1.6 src/external/cddl/osnet/sys/kern/ddi.c:1.7
--- src/external/cddl/osnet/sys/kern/ddi.c:1.6 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/ddi.c Wed May 22 08:44:48 2019
@@ -65,6 +65,7 @@
#include
#include
#include
+#include
#include
__strong_alias(ddi_strtol,ddi_strtoul)
@@ -142,6 +143,50 @@ do_mkdirp(const char *path)
return error;
}
+static void
+do_rmdirp(const char *path)
+{
+ struct pathbuf *pb;
+ struct nameidata nd;
+ char *here, *e;
+ int error;
+
+ here = PNBUF_GET();
+ strlcpy(here, path, MAXPATHLEN);
+ while ((e = strrchr(here, '/')) && e != here) {
+ *e = '\0';
+ pb = pathbuf_create(here);
+ if (pb == NULL)
+ break;
+ /* XXX need do_sys_rmdir()? */
+ NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF | TRYEMULROOT, pb);
+ error = namei(&nd);
+ if (error) {
+ pathbuf_destroy(pb);
+ break;
+ }
+ if ((nd.ni_vp->v_vflag & VV_ROOT) ||
+ nd.ni_vp->v_type != VDIR ||
+ nd.ni_vp->v_mountedhere ||
+ nd.ni_vp == nd.ni_dvp) {
+ VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
+ if (nd.ni_vp == nd.ni_dvp)
+vrele(nd.ni_dvp);
+ else
+vput(nd.ni_dvp);
+ vput(nd.ni_vp);
+ pathbuf_destroy(pb);
+ break;
+ }
+ error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
+ vput(nd.ni_dvp);
+ pathbuf_destroy(pb);
+ if (error)
+ break;
+ }
+ PNBUF_PUT(here);
+}
+
int
ddi_strtoul(const char *str, char **nptr, int base, unsigned long *result)
{
@@ -562,25 +607,49 @@ ddi_create_minor_node(dev_info_t *dip, c
minor_t minor_num, char *node_type, int flag)
{
struct lwp *l = curlwp;
+ vnode_t *vp;
+ enum vtype vtype;
+ struct stat sb;
char *pn;
dev_t dev;
int error;
register_t ret;
- printf("ddi_create_minor_node: name %s\n", name);
-
- dev = makedev(flag, minor_num);
-
pn = PNBUF_GET();
- if (spec_type == S_IFCHR)
+ if (spec_type == S_IFCHR) {
+ vtype = VCHR;
+ dev = makedev(dip->di_cmajor, minor_num);
snprintf(pn, MAXPATHLEN, "/dev/zvol/rdsk/%s", name);
- else
+ } else if (spec_type == S_IFBLK) {
+ vtype = VBLK;
+ dev = makedev(dip->di_bmajor, minor_num);
snprintf(pn, MAXPATHLEN, "/dev/zvol/dsk/%s", name);
+ } else {
+ panic("bad spec
CVS commit: src/external/cddl/osnet/sys
Module Name:src
Committed By: hannken
Date: Wed May 22 08:42:57 UTC 2019
Modified Files:
src/external/cddl/osnet/sys/kern: vfs.c
src/external/cddl/osnet/sys/sys: pathname.h
Log Message:
Implement the needed part of Solaris lookupname().
Remove unneeded protoype lookupnameat().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/kern/vfs.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/pathname.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/kern/vfs.c
diff -u src/external/cddl/osnet/sys/kern/vfs.c:1.7 src/external/cddl/osnet/sys/kern/vfs.c:1.8
--- src/external/cddl/osnet/sys/kern/vfs.c:1.7 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/vfs.c Wed May 22 08:42:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs.c,v 1.7 2018/05/28 21:05:09 chs Exp $ */
+/* $NetBSD: vfs.c,v 1.8 2019/05/22 08:42:57 hannken Exp $ */
/*-
* Copyright (c) 2006-2007 Pawel Jakub Dawidek
@@ -40,35 +40,24 @@ __FBSDID("$FreeBSD: head/sys/cddl/compat
#include
int
-lookupname(char *dirname, enum uio_seg seg, enum symfollow follow, vnode_t **dirvpp, vnode_t **compvpp)
+lookupname(char *dirname, enum uio_seg seg, enum symfollow follow,
+vnode_t **dirvpp, vnode_t **compvpp)
{
-return (lookupnameat(dirname, seg, follow, dirvpp, compvpp, NULL));
-}
-
-int
-lookupnameat(char *dirname, enum uio_seg seg, enum symfollow follow,
-vnode_t **dirvpp, vnode_t **compvpp, vnode_t *startvp)
-{
-
- struct nameidata nd;
int error;
- error = EOPNOTSUPP;
-
-/* XXX Disable until I upgrade testing kernel.
-KASSERT(dirvpp == NULL);
+ KASSERT(seg == UIO_SYSSPACE);
+ KASSERT(dirvpp == NULL);
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, dirname);
+ *compvpp = NULL;
+ error = namei_simple_kernel(dirname,
+ follow == FOLLOW ? NSM_FOLLOW_NOEMULROOT : NSM_NOFOLLOW_NOEMULROOT,
+ compvpp);
- if ((error = nameiat(&nd, startvp)) != 0)
- return error;
+ KASSERT(error == 0 || *compvpp == NULL);
- *compvpp = nd.ni_vp;*/
-
- return (error);
+return error;
}
-
void
vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg,
int flags)
Index: src/external/cddl/osnet/sys/sys/pathname.h
diff -u src/external/cddl/osnet/sys/sys/pathname.h:1.4 src/external/cddl/osnet/sys/sys/pathname.h:1.5
--- src/external/cddl/osnet/sys/sys/pathname.h:1.4 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/pathname.h Wed May 22 08:42:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pathname.h,v 1.4 2018/05/28 21:05:10 chs Exp $ */
+/* $NetBSD: pathname.h,v 1.5 2019/05/22 08:42:57 hannken Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -46,8 +46,6 @@ typedef struct pathname {
#define NO_FOLLOW NOFOLLOW
int lookupname(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **);
-int lookupnameat(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **,
-vnode_t *);
#endif /* _KERNEL */
CVS commit: src/external/cddl/osnet/sys
Module Name:src Committed By: hannken Date: Wed May 22 08:42:57 UTC 2019 Modified Files: src/external/cddl/osnet/sys/kern: vfs.c src/external/cddl/osnet/sys/sys: pathname.h Log Message: Implement the needed part of Solaris lookupname(). Remove unneeded protoype lookupnameat(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/kern/vfs.c cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/pathname.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: kamil
Date: Wed May 22 08:31:26 UTC 2019
Modified Files:
src/share/mk: bsd.sys.mk
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Allow to use KCOV + kASan together
Stop instrumenting KCOV files with kASan and the other way around.
This fixes booting of the setup of using them together.
In theory the checks could be more fine grained, however there is no good
reason (except extra DIAGNISTIC) for running a kernel sanitizer without
kernel coverage.
Patch by
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.291 src/share/mk/bsd.sys.mk:1.292
--- src/share/mk/bsd.sys.mk:1.291 Sat Feb 23 03:10:06 2019
+++ src/share/mk/bsd.sys.mk Wed May 22 08:31:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.291 2019/02/23 03:10:06 kamil Exp $
+# $NetBSD: bsd.sys.mk,v 1.292 2019/05/22 08:31:25 kamil Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -242,7 +242,7 @@ CFLAGS+= ${KLEAKFLAGS.${.IMPSRC:T}:U${KL
.if ${KCOV:U0} > 0
KCOVFLAGS= -fsanitize-coverage=trace-pc
-.for f in subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c
+.for f in subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c subr_asan.c
KCOVFLAGS.${f}= # empty
.endfor
CFLAGS+= ${KCOVFLAGS.${.IMPSRC:T}:U${KCOVFLAGS}}
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.76 src/sys/arch/amd64/conf/Makefile.amd64:1.77
--- src/sys/arch/amd64/conf/Makefile.amd64:1.76 Sun Feb 24 08:02:45 2019
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed May 22 08:31:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.76 2019/02/24 08:02:45 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.77 2019/05/22 08:31:25 kamil Exp $
# Makefile for NetBSD
#
@@ -54,7 +54,7 @@ KASANFLAGS= -fsanitize=kernel-address \
--param asan-globals=1 --param asan-stack=1 \
-fsanitize-address-use-after-scope \
-fasan-shadow-offset=0xDFFF9000
-.for f in subr_asan.c
+.for f in subr_asan.c subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c
KASANFLAGS.${f}= # empty
.endfor
CFLAGS+= ${KASANFLAGS.${.IMPSRC:T}:U${KASANFLAGS}}
CVS commit: src
Module Name:src Committed By: kamil Date: Wed May 22 08:31:26 UTC 2019 Modified Files: src/share/mk: bsd.sys.mk src/sys/arch/amd64/conf: Makefile.amd64 Log Message: Allow to use KCOV + kASan together Stop instrumenting KCOV files with kASan and the other way around. This fixes booting of the setup of using them together. In theory the checks could be more fine grained, however there is no good reason (except extra DIAGNISTIC) for running a kernel sanitizer without kernel coverage. Patch by To generate a diff of this commit: cvs rdiff -u -r1.291 -r1.292 src/share/mk/bsd.sys.mk cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/conf/Makefile.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Wed May 22 07:40:09 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: db_trace.c Log Message: Fix previous and use the original patch from PR port-sparc64/54221 instead (XXX should fix comments in param.h) To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Wed May 22 07:40:09 UTC 2019
Modified Files:
src/sys/arch/sparc64/sparc64: db_trace.c
Log Message:
Fix previous and use the original patch from PR port-sparc64/54221
instead (XXX should fix comments in param.h)
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/sparc64/db_trace.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/sparc64/sparc64/db_trace.c
diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.51 src/sys/arch/sparc64/sparc64/db_trace.c:1.52
--- src/sys/arch/sparc64/sparc64/db_trace.c:1.51 Wed May 22 04:17:39 2019
+++ src/sys/arch/sparc64/sparc64/db_trace.c Wed May 22 07:40:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.51 2019/05/22 04:17:39 martin Exp $ */
+/* $NetBSD: db_trace.c,v 1.52 2019/05/22 07:40:09 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.51 2019/05/22 04:17:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.52 2019/05/22 07:40:09 martin Exp $");
#include
#include
@@ -163,7 +163,7 @@ db_stack_trace_print(db_expr_t addr, boo
if (kernel_only) {
if (pc < KERNBASE || pc >= KERNEND)
break;
- if (frame < KERNBASE || frame >= KERNEND)
+ if (frame < KERNBASE || frame >= VM_MAX_KERNEL_ADDRESS)
break;
} else {
if (frame == 0 || frame == (vaddr_t)-1)
