CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Tue Apr 28 07:47:54 UTC 2020
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
use -O3 for c-common.c on mipse[lb]. -O2 (but not -O1, -Os, or -O3) fails:
/tmp/ccyXqMRz.s: Assembler messages:
/tmp/ccyXqMRz.s:35813: Error: branch out of range
/tmp/ccyXqMRz.s:85083: Error: branch out of range
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.14 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.15
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.14 Wed Feb 12 00:36:37 2020
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Tue Apr 28 07:47:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/02/12 00:36:37 fox Exp $
+# $NetBSD: Makefile,v 1.15 2020/04/28 07:47:54 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -60,6 +60,10 @@ COPTS.c-ubsan.c+=-O0
COPTS.cc1obj-checksum.c+=-O0
.endif
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+COPTS.c-common.c+=-O3
+.endif
+
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.11 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.12
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.11 Fri Feb 1 10:34:18 2019
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Tue Apr 28 07:47:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/02/01 10:34:18 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2020/04/28 07:47:54 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -52,6 +52,9 @@ COPTS.c-ubsan.c+=-O0
COPTS.cc1plus-checksum.c+=-O0
.endif
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+COPTS.c-common.c+=-O3
+.endif
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jmcneill
Date: Tue Apr 28 10:04:32 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
kern/55206: acpibat reporting broken by acpi_ec.c r1.81
Assume byte instead of qword alignment of the buffer passed to the EC
space handler.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/acpi/acpi_ec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.81 src/sys/dev/acpi/acpi_ec.c:1.82
--- src/sys/dev/acpi/acpi_ec.c:1.81 Sun Apr 12 01:12:03 2020
+++ src/sys/dev/acpi/acpi_ec.c Tue Apr 28 10:04:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.81 2020/04/12 01:12:03 riastradh Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.82 2020/04/28 10:04:32 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.81 2020/04/12 01:12:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.82 2020/04/28 10:04:32 jmcneill Exp $");
#include
#include
@@ -659,32 +659,30 @@ acpiec_space_handler(uint32_t func, ACPI
{
device_t dv;
ACPI_STATUS rv;
- uint8_t addr, reg;
+ uint8_t addr, *buf;
unsigned int i;
- if (paddr > 0xff || width % 8 != 0 || width > sizeof(ACPI_INTEGER)*8 ||
+ if (paddr > 0xff || width % 8 != 0 ||
value == NULL || arg == NULL || paddr + width / 8 > 0x100)
return AE_BAD_PARAMETER;
addr = paddr;
dv = arg;
+ buf = (uint8_t *)value;
rv = AE_OK;
switch (func) {
case ACPI_READ:
- *value = 0;
- for (i = 0; i < width; i += 8, ++addr) {
- rv = acpiec_read(dv, addr, ®);
+ for (i = 0; i < width; i += 8, ++addr, ++buf) {
+ rv = acpiec_read(dv, addr, buf);
if (rv != AE_OK)
break;
- *value |= (ACPI_INTEGER)reg << i;
}
break;
case ACPI_WRITE:
- for (i = 0; i < width; i += 8, ++addr) {
- reg = (*value >> i) & 0xff;
- rv = acpiec_write(dv, addr, reg);
+ for (i = 0; i < width; i += 8, ++addr, ++buf) {
+ rv = acpiec_write(dv, addr, *buf);
if (rv != AE_OK)
break;
}
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jmcneill Date: Tue Apr 28 11:02:37 UTC 2020 Modified Files: src/sys/dev/acpi: acpi_display.c Log Message: Demote "unknown output device" message from error to debug, and change the wording to reflect what is really happening -- the display output is not connected. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpi_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_display.c diff -u src/sys/dev/acpi/acpi_display.c:1.16 src/sys/dev/acpi/acpi_display.c:1.17 --- src/sys/dev/acpi/acpi_display.c:1.16 Thu Jun 1 02:45:09 2017 +++ src/sys/dev/acpi/acpi_display.c Tue Apr 28 11:02:37 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_display.c,v 1.16 2017/06/01 02:45:09 chs Exp $ */ +/* $NetBSD: acpi_display.c,v 1.17 2020/04/28 11:02:37 jmcneill Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.16 2017/06/01 02:45:09 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.17 2020/04/28 11:02:37 jmcneill Exp $"); #include #include @@ -1549,8 +1549,8 @@ acpidisp_vga_bind_outdevs(struct acpidis } } if (i == oi->oi_dev_count) - aprint_error_dev(asc->sc_dev, - "unknown output device %s\n", + aprint_debug_dev(asc->sc_dev, + "output device %s not connected\n", device_xname(osc->sc_dev)); } }
CVS commit: src/sys/arch/xen/xenbus
Module Name:src
Committed By: bouyer
Date: Tue Apr 28 13:21:01 UTC 2020
Modified Files:
src/sys/arch/xen/xenbus: xenbus_probe.c
Log Message:
Skip block device with device-type "cdrom", as their emulation can't be
disabled; and the backend driver doesn't handle them either.
Fix hang when booting with 'ioemu:hdc:cdrom' type disks.
While there convert some printf to aprint_error()
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/xenbus/xenbus_probe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.50 src/sys/arch/xen/xenbus/xenbus_probe.c:1.51
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.50 Sat Apr 25 15:26:18 2020
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Tue Apr 28 13:21:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.50 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.51 2020/04/28 13:21:01 bouyer Exp $ */
/**
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.50 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.51 2020/04/28 13:21:01 bouyer Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -399,7 +399,7 @@ xenbus_probe_device_type(const char *pat
err = xenbus_read_ul(NULL, xbusd->xbusd_path, "state",
&state, 10);
if (err) {
- printf("xenbus: can't get state "
+ aprint_error_dev(xenbus_dev, "can't get state "
"for %s (%d)\n", xbusd->xbusd_path, err);
kmem_free(xbusd, xbusd->xbusd_sz);
err = 0;
@@ -418,8 +418,9 @@ xenbus_probe_device_type(const char *pat
xbusd->xbusd_type = XENBUS_BACKEND_DEVICE;
err = read_frontend_details(xbusd);
if (err != 0) {
-printf("xenbus: can't get frontend details "
-"for %s (%d)\n", xbusd->xbusd_path, err);
+aprint_error_dev(xenbus_dev,
+"can't get frontend details for %s (%d)\n",
+xbusd->xbusd_path, err);
break;
}
if (create(xbusd)) {
@@ -432,16 +433,36 @@ xenbus_probe_device_type(const char *pat
xa.xa_type = type;
xa.xa_id = strtoul(dir[i], &ep, 0);
if (dir[i][0] == '\0' || *ep != '\0') {
-printf("xenbus device type %s: id %s is not a"
-" number\n", type, dir[i]);
+aprint_error_dev(xenbus_dev,
+"device type %s: id %s is not a number\n",
+type, dir[i]);
err = EFTYPE;
kmem_free(xbusd, xbusd->xbusd_sz);
break;
}
+ if (strcmp(xa.xa_type, "vbd") == 0) {
+char dtype[10];
+if (xenbus_read(NULL, xbusd->xbusd_path,
+"device-type", dtype, sizeof(dtype)) !=0) {
+ aprint_error_dev(xenbus_dev,
+ "%s: can't read device-type\n",
+ xbusd->xbusd_path);
+ kmem_free(xbusd, xbusd->xbusd_sz);
+ break;
+}
+if (strcmp(dtype, "cdrom") == 0) {
+ aprint_verbose_dev(xenbus_dev,
+ "ignoring %s type cdrom\n",
+ xbusd->xbusd_path);
+ kmem_free(xbusd, xbusd->xbusd_sz);
+ continue;
+}
+ }
err = read_backend_details(xbusd);
if (err != 0) {
-printf("xenbus: can't get backend details "
-"for %s (%d)\n", xbusd->xbusd_path, err);
+aprint_error_dev(xenbus_dev,
+"can't get backend details for %s (%d)\n",
+xbusd->xbusd_path, err);
kmem_free(xbusd, xbusd->xbusd_sz);
break;
}
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Tue Apr 28 13:27:29 UTC 2020
Modified Files:
src/sys/arch/xen/xen: hypervisor.c
Log Message:
Remove debug printfs
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/xen/xen/hypervisor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.76 src/sys/arch/xen/xen/hypervisor.c:1.77
--- src/sys/arch/xen/xen/hypervisor.c:1.76 Sat Apr 25 15:26:18 2020
+++ src/sys/arch/xen/xen/hypervisor.c Tue Apr 28 13:27:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.76 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.77 2020/04/28 13:27:29 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.76 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.77 2020/04/28 13:27:29 bouyer Exp $");
#include
#include
@@ -219,15 +219,12 @@ xen_check_hypervisordev(void)
case FSTATE_NOTFOUND:
case FSTATE_FOUND:
case FSTATE_STAR:
-printf("xen_check_hypervisordev: enabled\n");
return true;
default:
-printf("xen_check_hypervisordev: disabled\n");
return false;
}
}
}
- printf("xen_check_hypervisordev: notfound\n");
return 0;
}
int
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: rjs Date: Tue Apr 28 13:43:45 UTC 2020 Modified Files: src/distrib/sets/lists/tests: md.amd64 Log Message: The x86_pte tests are only built when MKKMOD=yes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/tests/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/md.amd64 diff -u src/distrib/sets/lists/tests/md.amd64:1.9 src/distrib/sets/lists/tests/md.amd64:1.10 --- src/distrib/sets/lists/tests/md.amd64:1.9 Sun Apr 26 09:08:40 2020 +++ src/distrib/sets/lists/tests/md.amd64 Tue Apr 28 13:43:45 2020 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.9 2020/04/26 09:08:40 maxv Exp $ +# $NetBSD: md.amd64,v 1.10 2020/04/28 13:43:45 rjs Exp $ ./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete @@ -12,6 +12,6 @@ ./usr/tests/lib/libnvmm/t_io_assist tests-lib-tests compattestfile,atf ./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf ./usr/tests/lib/libnvmm/t_mem_assist tests-lib-tests compattestfile,atf -./usr/tests/modules/t_x86_pte tests-sys-tests atf -./usr/tests/modules/x86_pte_tester tests-sys-tests atf -./usr/tests/modules/x86_pte_tester/x86_pte_tester.kmod tests-sys-tests atf +./usr/tests/modules/t_x86_pte tests-sys-tests atf,kmod +./usr/tests/modules/x86_pte_tester tests-sys-tests atf,kmod +./usr/tests/modules/x86_pte_tester/x86_pte_tester.kmod tests-sys-tests atf,kmod
CVS commit: src/lib/libkvm
Module Name:src
Committed By: christos
Date: Tue Apr 28 14:27:41 UTC 2020
Modified Files:
src/lib/libkvm: kvm.c
Log Message:
Don't treat failure to map the file as fatal.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/lib/libkvm/kvm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm.c
diff -u src/lib/libkvm/kvm.c:1.107 src/lib/libkvm/kvm.c:1.108
--- src/lib/libkvm/kvm.c:1.107 Mon Apr 27 20:19:23 2020
+++ src/lib/libkvm/kvm.c Tue Apr 28 10:27:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.107 2020/04/28 00:19:23 christos Exp $ */
+/* $NetBSD: kvm.c,v 1.108 2020/04/28 14:27:41 christos Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#else
-__RCSID("$NetBSD: kvm.c,v 1.107 2020/04/28 00:19:23 christos Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.108 2020/04/28 14:27:41 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -399,8 +399,6 @@ _kvm_open(kvm_t *kd, const char *uf, con
kd->dump_size = (size_t)st.st_size;
kd->dump_mem = mmap(NULL, kd->dump_size, PROT_READ|PROT_WRITE,
MAP_FILE|MAP_PRIVATE, kd->pmfd, 0);
- if (kd->dump_mem == MAP_FAILED)
- goto failed;
}
return (kd);
failed:
CVS commit: src/sys/arch/hp300/stand
Module Name:src
Committed By: tsutsui
Date: Tue Apr 28 14:45:24 UTC 2020
Modified Files:
src/sys/arch/hp300/stand/common: netio.c
src/sys/arch/hp300/stand/inst: version
src/sys/arch/hp300/stand/uboot: version
Log Message:
Fix inappropriate error messages when nfs_mount() fails.
Noticed by Chris Hanson and his HP330 and confirmed on my HP425e.
Also bump revisions to denote visible changes.
Worth to pull up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/inst/version
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp300/stand/uboot/version
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/hp300/stand/common/netio.c
diff -u src/sys/arch/hp300/stand/common/netio.c:1.16 src/sys/arch/hp300/stand/common/netio.c:1.17
--- src/sys/arch/hp300/stand/common/netio.c:1.16 Sat Jun 11 06:20:11 2016
+++ src/sys/arch/hp300/stand/common/netio.c Tue Apr 28 14:45:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netio.c,v 1.16 2016/06/11 06:20:11 dholland Exp $ */
+/* $NetBSD: netio.c,v 1.17 2020/04/28 14:45:23 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -158,7 +158,6 @@ netstrategy(void *devdata, int func, dad
int
netmountroot(struct open_file *f, char *devname)
{
- int error;
struct iodesc *d;
#ifdef DEBUG
@@ -260,7 +259,8 @@ netmountroot(struct open_file *f, char *
do_nfs_mount:
/* Get the NFS file handle (mount). */
- error = nfs_mount(netdev_sock, rootip, rootpath);
+ if (nfs_mount(netdev_sock, rootip, rootpath))
+ return errno;
- return error;
+ return 0;
}
Index: src/sys/arch/hp300/stand/inst/version
diff -u src/sys/arch/hp300/stand/inst/version:1.13 src/sys/arch/hp300/stand/inst/version:1.14
--- src/sys/arch/hp300/stand/inst/version:1.13 Sun Jan 17 08:05:20 2016
+++ src/sys/arch/hp300/stand/inst/version Tue Apr 28 14:45:24 2020
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.13 2016/01/17 08:05:20 tsutsui Exp $
+$NetBSD: version,v 1.14 2020/04/28 14:45:24 tsutsui Exp $
1.1: Initial version
1.2: Added support for HP-IB cartridge tapes
@@ -13,3 +13,4 @@ $NetBSD: version,v 1.13 2016/01/17 08:05
1.11: Add support for framebuffers on HP362 and HP382.
1.12: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd.
1.13: Disable slow gunzip CRC32 calculation.
+1.14: Fix wrong errno when nfs_mount() fails.
Index: src/sys/arch/hp300/stand/uboot/version
diff -u src/sys/arch/hp300/stand/uboot/version:1.20 src/sys/arch/hp300/stand/uboot/version:1.21
--- src/sys/arch/hp300/stand/uboot/version:1.20 Sun Jan 17 08:05:20 2016
+++ src/sys/arch/hp300/stand/uboot/version Tue Apr 28 14:45:24 2020
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.20 2016/01/17 08:05:20 tsutsui Exp $
+$NetBSD: version,v 1.21 2020/04/28 14:45:24 tsutsui Exp $
1.1: Initial version
1.2: Added support for network booting
@@ -20,3 +20,4 @@ $NetBSD: version,v 1.20 2016/01/17 08:05
1.18: Add support for framebuffers on HP362 and HP382.
1.19: Add and fix support for HP425e mcclock, sti framebuffer, apci and dnkbd.
1.20: Disable slow gunzip CRC32 calculation.
+1.21: Fix wrong errno when nfs_mount() fails.
CVS commit: src/sys/netinet6
Module Name:src
Committed By: roy
Date: Tue Apr 28 15:12:28 UTC 2020
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
inet6: Ensure that route MTU is guarded by ARC_PHDS_MAXMTU
This mirrors the ARP behavior for ARCnet interfaces based on current
kernel RA handling.
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/netinet6/nd6.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.269 src/sys/netinet6/nd6.c:1.270
--- src/sys/netinet6/nd6.c:1.269 Sun Apr 12 12:13:52 2020
+++ src/sys/netinet6/nd6.c Tue Apr 28 15:12:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.269 2020/04/12 12:13:52 roy Exp $ */
+/* $NetBSD: nd6.c,v 1.270 2020/04/28 15:12:28 roy Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.269 2020/04/12 12:13:52 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.270 2020/04/28 15:12:28 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1462,8 +1462,22 @@ nd6_rtrequest(int req, struct rtentry *r
return;
}
- if ((rt->rt_flags & RTF_GATEWAY) != 0)
+ if ((rt->rt_flags & RTF_GATEWAY) != 0) {
+ if (req != RTM_ADD)
+ return;
+ /*
+ * linklayers with particular MTU limitation.
+ */
+ switch(ifp->if_type) {
+#if NARCNET > 0
+ case IFT_ARCNET:
+ if (rt->rt_rmx.rmx_mtu > ARC_PHDS_MAXMTU) /* RFC2497 */
+rt->rt_rmx.rmx_mtu = ARC_PHDS_MAXMTU;
+ break;
+#endif
+ }
return;
+ }
if (nd6_need_cache(ifp) == 0 && (rt->rt_flags & RTF_HOST) == 0) {
RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Apr 28 15:44:07 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #858): sys/dev/pci/if_mcx.c: revision 1.13 mcx: sync with OpenBSD sys/dev/pci/if_mcx.c r1.44 1.44: Fix typo which could lead into a double free 1.43: Commands that create objects return a 24 bit object ID, so mask off the high 8 bits of the value we extract, in case the firmware leaves junk there. Hrvoje Popovski has seen this with newer firmware on a ConnectX 5 card, which now works properly. 1.42: Increase the completion queue size to prevent overflow. Under reasonably unlikely circumstances - lots of single-fragment packets being sent, a significant number of packets being received, while the interrupt handler was unable to process the completion queue - the completion queue could overflow, which would result in the interface locking up. 1.41: Check if we've reached the end of the current mailbox before writing past the end of it, rather than after. Now we can actually allocate queues big enough to need multiple mailboxes. 1.40: Don't call mcx_intr() from mcx_cmdq_poll(); this was a leftover from early development that I forgot about, but turns out to be a potential race with the actual interrupt handler. 1.39: fix previous: use the correct offset for sq/rq creation, and don't reset the mbox counter to 0 after calculating it. 1.38: Add a helper function for writing physical addresses for queues into command queue mailboxes, and use this for all queue setup commands. Previously we just assumed the addresses would fit in the first mailbox, which is currently true but may not be for much longer. 1.37: (skipped) 1.36: The event queue consumer counter also needs to be unsigned like the others. 1.35: try to make if_baudrate look plausible. this updates the eth proto capability map so it records the baudrate against the different link types and their media, and then reads it when the link state changes. 1.34: (skipped) To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_mcx.c diff -u src/sys/dev/pci/if_mcx.c:1.1.2.9 src/sys/dev/pci/if_mcx.c:1.1.2.10 --- src/sys/dev/pci/if_mcx.c:1.1.2.9 Sun Mar 1 12:47:10 2020 +++ src/sys/dev/pci/if_mcx.c Tue Apr 28 15:44:06 2020 @@ -1,5 +1,5 @@ -/* $NetBSD: if_mcx.c,v 1.1.2.9 2020/03/01 12:47:10 martin Exp $ */ -/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */ +/* $NetBSD: if_mcx.c,v 1.1.2.10 2020/04/28 15:44:06 martin Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.44 2020/04/24 07:28:37 mestre Exp $ */ /* * Copyright (c) 2017 David Gwynne @@ -82,7 +82,7 @@ /* queue sizes */ #define MCX_LOG_EQ_SIZE 6 /* one page */ -#define MCX_LOG_CQ_SIZE 11 +#define MCX_LOG_CQ_SIZE 12 #define MCX_LOG_RQ_SIZE 10 #define MCX_LOG_SQ_SIZE 11 @@ -154,33 +154,33 @@ #define MCX_REG_PPCNT 0x5008 #define MCX_REG_MCIA 0x9014 -#define MCX_ETHER_CAP_SGMII (1 << 0) -#define MCX_ETHER_CAP_1000_KX (1 << 1) -#define MCX_ETHER_CAP_10G_CX4 (1 << 2) -#define MCX_ETHER_CAP_10G_KX4 (1 << 3) -#define MCX_ETHER_CAP_10G_KR (1 << 4) -#define MCX_ETHER_CAP_20G_KR2 (1 << 5) -#define MCX_ETHER_CAP_40G_CR4 (1 << 6) -#define MCX_ETHER_CAP_40G_KR4 (1 << 7) -#define MCX_ETHER_CAP_56G_R4 (1 << 8) -#define MCX_ETHER_CAP_10G_CR (1 << 12) -#define MCX_ETHER_CAP_10G_SR (1 << 13) -#define MCX_ETHER_CAP_10G_LR (1 << 14) -#define MCX_ETHER_CAP_40G_SR4 (1 << 15) -#define MCX_ETHER_CAP_40G_LR4 (1 << 16) -#define MCX_ETHER_CAP_50G_SR2 (1 << 18) -#define MCX_ETHER_CAP_100G_CR4 (1 << 20) -#define MCX_ETHER_CAP_100G_SR4 (1 << 21) -#define MCX_ETHER_CAP_100G_KR4 (1 << 22) -#define MCX_ETHER_CAP_100G_LR4 (1 << 23) -#define MCX_ETHER_CAP_100_TX (1 << 24) -#define MCX_ETHER_CAP_1000_T (1 << 25) -#define MCX_ETHER_CAP_10G_T (1 << 26) -#define MCX_ETHER_CAP_25G_CR (1 << 27) -#define MCX_ETHER_CAP_25G_KR (1 << 28) -#define MCX_ETHER_CAP_25G_SR (1 << 29) -#define MCX_ETHER_CAP_50G_CR2 (1 << 30) -#define MCX_ETHER_CAP_50G_KR2 (1 << 31) +#define MCX_ETHER_CAP_SGMII 0 +#define MCX_ETHER_CAP_1000_KX 1 +#define MCX_ETHER_CAP_10G_CX4 2 +#define MCX_ETHER_CAP_10G_KX4 3 +#define MCX_ETHER_CAP_10G_KR 4 +#define MCX_ETHER_CAP_20G_KR2 5 +#define MCX_ETHER_CAP_40G_CR4 6 +#define MCX_ETHER_CAP_40G_KR4 7 +#define MCX_ETHER_CAP_56G_R4 8 +#define MCX_ETHER_CAP_10G_CR 12 +#define MCX_ETHER_CAP_10G_SR 13 +#define MCX_ETHER_CAP_10G_LR 14 +#define MCX_ETHER_CAP_40G_SR4 15 +#define MCX_ETHER_CAP_40G_LR4 16 +#define MCX_ETHER_CAP_50G_SR2 18 +#define MCX_ETHER_CAP_100G_CR4 20 +#define MCX_ETHER_CAP_100G_SR4 21 +#define MCX_ETHER_CAP_100G_KR4 22 +#define MCX_ETHER_CAP_100G_LR4 23 +#define MCX_ETHER_CAP_100_TX 24 +#define MCX_ETHER_CAP_1000_T 25 +#define MCX_ETHER_CAP_10G_T 26 +#define MCX
CVS commit: src/sys/arch
Module Name:src
Committed By: bouyer
Date: Tue Apr 28 15:43:34 UTC 2020
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
src/sys/arch/xen/xen: hypervisor.c
Log Message:
Add xbd to the list of valid disks.
Remove hardcoded root on xbd0 for Xen PVHVM, now that the x86 findroot()
knowns about xbd disks.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x86/x86/x86_autoconf.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/xen/xen/hypervisor.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/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.80 src/sys/arch/x86/x86/x86_autoconf.c:1.81
--- src/sys/arch/x86/x86/x86_autoconf.c:1.80 Sat Apr 25 15:26:18 2020
+++ src/sys/arch/x86/x86/x86_autoconf.c Tue Apr 28 15:43:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.80 2020/04/25 15:26:18 bouyer Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.81 2020/04/28 15:43:34 bouyer Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.80 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.81 2020/04/28 15:43:34 bouyer Exp $");
#include
#include
@@ -99,6 +99,7 @@ is_valid_disk(device_t dv)
device_is_a(dv, "sd") ||
device_is_a(dv, "wd") ||
device_is_a(dv, "ld") ||
+ device_is_a(dv, "xbd") ||
device_is_a(dv, "ed"));
}
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.77 src/sys/arch/xen/xen/hypervisor.c:1.78
--- src/sys/arch/xen/xen/hypervisor.c:1.77 Tue Apr 28 13:27:29 2020
+++ src/sys/arch/xen/xen/hypervisor.c Tue Apr 28 15:43:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.77 2020/04/28 13:27:29 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.78 2020/04/28 15:43:34 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.77 2020/04/28 13:27:29 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.78 2020/04/28 15:43:34 bouyer Exp $");
#include
#include
@@ -499,41 +499,6 @@ hypervisor_attach(device_t parent, devic
const struct sysctlnode *node = NULL;
#ifdef XENPVHVM
- /*
- * Set the boot device to xbd0a.
- * We claim this is a reasonable default which is picked up
- * later as the rootfs device.
- *
- * We need to do this because the HVM domain loader uses the
- * regular BIOS based native boot(8) procedure, which sets the
- * boot device to the native driver/partition of whatever was
- * detected by the native bootloader.
- */
-
- struct btinfo_rootdevice bi;
- snprintf(bi.devname, 6, "xbd0a");
- bi.common.type = BTINFO_ROOTDEVICE;
- bi.common.len = sizeof(struct btinfo_rootdevice);
-
- /* From i386/multiboot.c */
- int i, len;
- vaddr_t data;
- extern struct bootinfo bootinfo;
- struct bootinfo *bip = (struct bootinfo *)&bootinfo;
- len = bi.common.len;
-
- data = (vaddr_t)&bip->bi_data;
- for (i = 0; i < bip->bi_nentries; i++) {
- struct btinfo_common *tmp;
-
- tmp = (struct btinfo_common *)data;
- data += tmp->len;
- }
- if (data + len < (vaddr_t)&bip->bi_data + sizeof(bip->bi_data)) {
- memcpy((void *)data, &bi, len);
- bip->bi_nentries++;
- }
-
/* disable emulated devices */
if (inw(XEN_MAGIC_IOPORT) == XMI_MAGIC) {
outw(XEN_MAGIC_IOPORT, XMI_UNPLUG_IDE_DISKS | XMI_UNPLUG_NICS);
CVS commit: [netbsd-9] src/usr.bin/calendar/calendars
Module Name:src Committed By: martin Date: Tue Apr 28 15:58:51 UTC 2020 Modified Files: src/usr.bin/calendar/calendars [netbsd-9]: calendar.birthday calendar.computer calendar.music calendar.netbsd Log Message: Pull up following revision(s) (requested by sevan in ticket #859): usr.bin/calendar/calendars/calendar.netbsd: revision 1.45 usr.bin/calendar/calendars/calendar.netbsd: revision 1.46 usr.bin/calendar/calendars/calendar.music: revision 1.21 usr.bin/calendar/calendars/calendar.music: revision 1.22 usr.bin/calendar/calendars/calendar.music: revision 1.23 usr.bin/calendar/calendars/calendar.birthday: revision 1.40 usr.bin/calendar/calendars/calendar.birthday: revision 1.41 usr.bin/calendar/calendars/calendar.computer: revision 1.10 usr.bin/calendar/calendars/calendar.computer: revision 1.11 usr.bin/calendar/calendars/calendar.computer: revision 1.12 usr.bin/calendar/calendars/calendar.birthday: revision 1.37 usr.bin/calendar/calendars/calendar.birthday: revision 1.38 usr.bin/calendar/calendars/calendar.birthday: revision 1.39 usr.bin/calendar/calendars/calendar.netbsd: revision 1.44 Add Doug Engelbart Apple buys NeXT Add Andrew Weatherall https://www.bbc.co.uk/news/entertainment-arts-51535685 http://www.rottersgolfclub.com/ Add Larry Tesler https://www.nytimes.com/2020/02/20/technology/lawrence-tesler-dead.html Add Bert Sutherland https://twitter.com/ComputerHistory/status/1230200277141250050 Add Ivan Sutherland's birthday Add Ken Kesey Add The KLF's Chill Out Add K&R publish date https://twitter.com/MIT_CSAIL/status/1231263883303645184 Note the birthday of Symbolics.com Add higher state of consciousness https://twitter.com/joshwink1/status/1243360644042113024 Add NetBSD 9.0 & 8.2 Heads up by Harold Gutch align just spaces To generate a diff of this commit: cvs rdiff -u -r1.29.2.2 -r1.29.2.3 \ src/usr.bin/calendar/calendars/calendar.birthday cvs rdiff -u -r1.7.2.1 -r1.7.2.2 \ src/usr.bin/calendar/calendars/calendar.computer cvs rdiff -u -r1.19.2.1 -r1.19.2.2 \ src/usr.bin/calendar/calendars/calendar.music cvs rdiff -u -r1.40.2.1 -r1.40.2.2 \ src/usr.bin/calendar/calendars/calendar.netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.birthday diff -u src/usr.bin/calendar/calendars/calendar.birthday:1.29.2.2 src/usr.bin/calendar/calendars/calendar.birthday:1.29.2.3 --- src/usr.bin/calendar/calendars/calendar.birthday:1.29.2.2 Thu Jan 23 10:09:01 2020 +++ src/usr.bin/calendar/calendars/calendar.birthday Tue Apr 28 15:58:51 2020 @@ -35,6 +35,7 @@ 01/25 Virginia Woolf born, 1882 01/25 W. Somerset Maugham born, 1874 01/27 Samuel Gompers born, 1850 +01/30 Douglas Carl Engelbart was born in Portland, Oregon, 1925 01/30 Franklin Delano Roosevelt born in Hyde Park, New York, 1882 01/31 Jackie Robinson born, 1919 02/01 Terence Graham Parry Jones was born in Colwyn Bay, Denbighshire, Wales, 1942 @@ -56,11 +57,13 @@ 02/15 Galileo Galilei born in Pisa, Italy, 1564 02/15 Richard Philips Feynman died in Los Angeles, California, 1988 02/15 Susan B. Anthony born, 1820 +02/16 Lawrence Gordon Tesler died in Portola Valley, California, 2020 02/16 Pierre Bouguer born, 1698, founder of photometry 02/17 Frederick Eugene Ives born, 1856, pioneer of halftone 02/17 Marion Anderson born, 1902 02/17 T. J. Watson, Sr. born, 1874 02/18 Ernst Mach born, 1838, philosopher & optics pioneer +02/18 William Robert "Bert" Sutherland died in Mountain View, California, 2020 02/19 Nicolas Copernicus born in Thorn, Poland, 1473 02/20 Ludwig Boltzmann born, 1838, atomic physics pioneer 02/21 Alexis De Rochon born, 1838, developed the spyglass @@ -121,6 +124,7 @@ 04/15 Leonardo da Vinci born, 1452 04/16 Charles (Charlie) Chaplin (Sir) born in London, 1889 04/22 Immanuel Kant born, 1724 +04/24 Lawrence Gordon Tesler was born in The Bronx, New York City, 1945 04/27 Louis Victor de Broglie born, 1774, physicist 04/28 James Monroe born, 1758 04/29 Jules Henri Poincare born, 1854, founder of topology @@ -131,12 +135,14 @@ 05/02 Dr. Benjamin Spock born, 1903 05/09 Pinza died, 1957 05/10 Fred Astaire (Frederick Austerlitz) born in Omaha, Nebraska, 1899 +05/10 William Robert "Bert" Sutherland was born in Hastings, Nebraska, 1936 05/11 Douglas Adams died, 2001 05/11 Johnny Appleseed born, 1768 05/11 Richard Philips Feynman was born is Queens, New York, 1918 05/12 Florence Nightingale born in Florence, Italy, 1820 05/13 Arthur S. Sullivan born, 1842 05/15 Mike Oldfield born in Essex, England, 1953 +05/16 Ivan Edward Sutherland was born in Hastings, Nebraska, 1938 05/19 Ho Chi Minh born, 1890 05/21 Plato (Aristocles) born in Athens(?), 427 BC 05/27 Hubert H. Humphrey born, 1911 @@ -164,6 +170,7 @@ 06/25 Eric Arthur
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 28 16:15:34 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #858 and #859 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.43 src/doc/CHANGES-9.1:1.1.2.44 --- src/doc/CHANGES-9.1:1.1.2.43 Mon Apr 27 14:57:31 2020 +++ src/doc/CHANGES-9.1 Tue Apr 28 16:15:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.43 2020/04/27 14:57:31 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.44 2020/04/28 16:15:34 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -2252,3 +2252,16 @@ sys/dev/nvmm/nvmm.c1.26 CPU types. [maxv, ticket #857] +sys/dev/pci/if_mcx.c1.13 + + mcx(4): various fixes. + [jmcneill, ticket #858] + +usr.bin/calendar/calendars/calendar.birthday 1.37-1.41 +usr.bin/calendar/calendars/calendar.computer 1.10-1.12 +usr.bin/calendar/calendars/calendar.music 1.21-1.23 +usr.bin/calendar/calendars/calendar.netbsd 1.44-1.46 + + Sync calendars with HEAD. + [sevan, ticket #859] +
CVS commit: [netbsd-9] src/sys/dev/pckbport
Module Name:src
Committed By: martin
Date: Tue Apr 28 16:22:15 UTC 2020
Modified Files:
src/sys/dev/pckbport [netbsd-9]: synaptics.c synapticsvar.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #863):
sys/dev/pckbport/synaptics.c: revision 1.65
sys/dev/pckbport/synapticsvar.h: revision 1.10
Extended buttons are reported separate from touchpad buttons, so track
button press / release state separate from touch events.
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.3 -r1.50.2.4 src/sys/dev/pckbport/synaptics.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/dev/pckbport/synapticsvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.50.2.3 src/sys/dev/pckbport/synaptics.c:1.50.2.4
--- src/sys/dev/pckbport/synaptics.c:1.50.2.3 Thu Apr 2 19:23:41 2020
+++ src/sys/dev/pckbport/synaptics.c Tue Apr 28 16:22:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.50.2.3 2020/04/02 19:23:41 martin Exp $ */
+/* $NetBSD: synaptics.c,v 1.50.2.4 2020/04/28 16:22:15 martin Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.3 2020/04/02 19:23:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50.2.4 2020/04/28 16:22:15 martin Exp $");
#include
#include
@@ -1009,19 +1009,29 @@ pms_synaptics_parse(struct pms_softc *ps
psc->packet[3], psc->packet[4], psc->packet[5]);
if ((psc->packet[4] & SYN_1BUTMASK) != 0)
-sp.sp_left = PMS_LBUTMASK;
+sc->ext_left = PMS_LBUTMASK;
+ else
+sc->ext_left = 0;
if ((psc->packet[4] & SYN_3BUTMASK) != 0)
-sp.sp_middle = PMS_MBUTMASK;
+sc->ext_middle = PMS_MBUTMASK;
+ else
+sc->ext_middle = 0;
if ((psc->packet[5] & SYN_2BUTMASK) != 0)
-sp.sp_right = PMS_RBUTMASK;
+sc->ext_right = PMS_RBUTMASK;
+ else
+sc->ext_right = 0;
if ((psc->packet[5] & SYN_4BUTMASK) != 0)
-sp.sp_up = 1;
+sc->ext_up = 1;
+ else
+sc->ext_up = 0;
if ((psc->packet[4] & SYN_5BUTMASK) != 0)
-sp.sp_down = 1;
+sc->ext_down = 1;
+ else
+sc->ext_down = 0;
} else {
/* Left/Right button handling. */
sp.sp_left = psc->packet[0] & PMS_LBUTMASK;
@@ -1101,6 +,13 @@ pms_synaptics_parse(struct pms_softc *ps
sp.sp_middle = 0;
}
+ /* Overlay extended button state */
+ sp.sp_left |= sc->ext_left;
+ sp.sp_right |= sc->ext_right;
+ sp.sp_middle |= sc->ext_middle;
+ sp.sp_up |= sc->ext_up;
+ sp.sp_down |= sc->ext_down;
+
switch (synaptics_up_down_emul) {
case 1:
/* Do middle button emulation using up/down buttons */
Index: src/sys/dev/pckbport/synapticsvar.h
diff -u src/sys/dev/pckbport/synapticsvar.h:1.9 src/sys/dev/pckbport/synapticsvar.h:1.9.2.1
--- src/sys/dev/pckbport/synapticsvar.h:1.9 Sun Jun 2 08:55:00 2019
+++ src/sys/dev/pckbport/synapticsvar.h Tue Apr 28 16:22:15 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsvar.h,v 1.9 2019/06/02 08:55:00 blymn Exp $ */
+/* $NetBSD: synapticsvar.h,v 1.9.2.1 2020/04/28 16:22:15 martin Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -89,6 +89,12 @@ struct synaptics_softc {
int history_x[SYN_MAX_FINGERS][SYN_HIST_SIZE];
int history_y[SYN_MAX_FINGERS][SYN_HIST_SIZE];
int history_z[SYN_MAX_FINGERS][SYN_HIST_SIZE];
+
+ char ext_left;
+ char ext_right;
+ char ext_middle;
+ char ext_up;
+ char ext_down;
};
int pms_synaptics_probe_init(void *vsc);
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Apr 28 16:22:25 UTC 2020
Modified Files:
src/sys/kern: sys_futex.c
Log Message:
Fix waiting on a zero bitset.
The logic in futex_wait assumes there are two paths out:
1. Error (signal or timeout), in which case we take ourselves off the
queue.
2. Wakeup, in which case the waker takes us off the queue.
But if the user does FUTEX_WAIT_BITSET(bitset=0), as in the
futex_wait_pointless_bitset test, then we will never even go to
sleep, so there will be nobody to wake us as in (2), but it's not an
error as in (1) either. As a result, we're left on the queue.
Instead, don't bother with any of the wait machinery in that case.
This does not actually match Linux semantics -- Linux returns EINVAL
if bitset is zero. But let's make sure this passes the releng test
rig as the tests are written now, and then fix both the logic and the
tests -- this is a candidate fix for:
lib/libc/sys/t_futex_ops (277/847): 20 test cases
futex_basic_wait_wake_private: [6.645189s] Passed.
futex_basic_wait_wake_shared: [6.572692s] Passed.
futex_cmp_requeue: [4.624082s] Passed.
futex_requeue: [4.427191s] Passed.
futex_wait_pointless_bitset: [0.202865s] Passed.
futex_wait_timeout_deadline: [ 9074.4164779] panic: TAILQ_INSERT_TAIL
0x56a1ad48
/tmp/bracket/build/2020.04.28.03.00.23-evbarm-aarch64/src/sys/kern/sys_futex.c:826
[ 9074.4340691] cpu0: Begin traceback...
[ 9074.4340691] trace fp c0004ceffb40
[ 9074.4340691] fp c0004ceffb60 vpanic() at c04aac58
netbsd:vpanic+0x160
[ 9074.4441432] fp c0004ceffbd0 panic() at c04aad4c
netbsd:panic+0x44
[ 9074.4441432] fp c0004ceffc60 futex_wait_enqueue() at c04b7710
netbsd:futex_wait_enqueue+0x138
[ 9074.4555795] fp c0004ceffc80 futex_func_wait.part.5() at
c04b82f4 netbsd:futex_func_wait.part.5+0x17c
[ 9074.4660518] fp c0004ceffd50 do_futex() at c04b8cd8
netbsd:do_futex+0x1d0
[ 9074.4660518] fp c0004ceffdf0 sys___futex() at c04b9078
netbsd:sys___futex+0x50
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/sys_futex.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/sys_futex.c
diff -u src/sys/kern/sys_futex.c:1.5 src/sys/kern/sys_futex.c:1.6
--- src/sys/kern/sys_futex.c:1.5 Tue Apr 28 00:54:24 2020
+++ src/sys/kern/sys_futex.c Tue Apr 28 16:22:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_futex.c,v 1.5 2020/04/28 00:54:24 riastradh Exp $ */
+/* $NetBSD: sys_futex.c,v 1.6 2020/04/28 16:22:25 riastradh Exp $ */
/*-
* Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.5 2020/04/28 00:54:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.6 2020/04/28 16:22:25 riastradh Exp $");
/*
* Futexes
@@ -785,6 +785,8 @@ static void
futex_wait_init(struct futex_wait *fw, int bitset)
{
+ KASSERT(bitset);
+
mutex_init(&fw->fw_lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(&fw->fw_cv, "futex");
fw->fw_futex = NULL;
@@ -802,6 +804,8 @@ static void
futex_wait_fini(struct futex_wait *fw)
{
+ KASSERT(fw->fw_futex == NULL);
+
cv_destroy(&fw->fw_cv);
mutex_destroy(&fw->fw_lock);
}
@@ -1193,6 +1197,13 @@ futex_func_wait(bool shared, int *uaddr,
const struct timespec *deadline;
int error;
+ /*
+ * If there's nothing to wait for, and nobody will ever wake
+ * us, then don't set anything up to wait -- just stop here.
+ */
+ if (val3 == 0)
+ return 0;
+
/* Optimistically test before anything else. */
if (!futex_test(uaddr, val))
return EAGAIN;
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Apr 28 16:26:44 UTC 2020 Modified Files: src/share/man/man4 [netbsd-9]: rtsx.4 src/sys/dev/pci [netbsd-9]: pcidevs rtsx_pci.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #864): share/man/man4/rtsx.4: revision 1.6 sys/dev/pci/pcidevs: revision 1.1410 sys/dev/pci/rtsx_pci.c: revision 1.9 Add an eclectic mix of GeForce GTX 680, RTS522A PCI-E Card Reader, intel wifi 9560 + whitespace Add support for Realtek RTS522A To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.4.1 src/share/man/man4/rtsx.4 cvs rdiff -u -r1.1383.2.6 -r1.1383.2.7 src/sys/dev/pci/pcidevs cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/pci/rtsx_pci.c 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/rtsx.4 diff -u src/share/man/man4/rtsx.4:1.5 src/share/man/man4/rtsx.4:1.5.4.1 --- src/share/man/man4/rtsx.4:1.5 Tue Apr 24 18:35:56 2018 +++ src/share/man/man4/rtsx.4 Tue Apr 28 16:26:43 2020 @@ -1,10 +1,10 @@ -.\" $NetBSD: rtsx.4,v 1.5 2018/04/24 18:35:56 maya Exp $ +.\" $NetBSD: rtsx.4,v 1.5.4.1 2020/04/28 16:26:43 martin Exp $ .\" $OpenBSD: rtsx.4,v 1.6 2014/05/18 10:52:17 stsp Exp $ .\" .\" Theo de Raadt, 2006. Public Domain. .\" Stefan Sperling, 2012. Public Domain. .\" -.Dd April 24, 2018 +.Dd April 27, 2020 .Dt RTSX 4 .Os .Sh NAME @@ -17,7 +17,7 @@ The .Nm driver provides support for the Realtek RTS5209, RTS5227, RTS5229, -RTS525A, RTL8402, RTL8411 and RTL8411B SD card readers. +RTS522A, RTS525A, RTL8402, RTL8411 and RTL8411B SD card readers. .Pp The .Xr sdmmc 4 Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.6 src/sys/dev/pci/pcidevs:1.1383.2.7 --- src/sys/dev/pci/pcidevs:1.1383.2.6 Thu Mar 19 19:13:33 2020 +++ src/sys/dev/pci/pcidevs Tue Apr 28 16:26:43 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.6 2020/03/19 19:13:33 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.7 2020/04/28 16:26:43 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1109,7 +1109,7 @@ product AMD PCSCSI_PCI 0x2020 PCscsi-PC product AMD GEODELX_PCHB 0x2080 Geode LX Host-PCI Bridge product AMD GEODELX_VGA 0x2081 Geode LX VGA Controller product AMD GEODELX_AES 0x2082 Geode LX AES Security Block -product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge +product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge product AMD CS5536_PCIB 0x2090 CS5536 PCI-ISA Bridge product AMD CS5536_FLASH 0x2091 CS5536 Flash product AMD CS5536_AUDIO 0x2093 CS5536 Audio @@ -5416,6 +5416,7 @@ product INTEL 100SERIES_LP_I2C_5 0x9d65 product INTEL 100SERIES_LP_UART_2 0x9d66 100 Series UART 2 product INTEL 100SERIES_LP_HDA 0x9d70 100 Series HD Audio product INTEL 2HS_U_HDA 0x9d71 200 Series HD Audio +product INTEL WIFI_LINK_9560_1 0x9df0 Dual Band Wireless AC 9560 product INTEL PINEVIEW_HB 0xa000 Pineview Host Bridge product INTEL PINEVIEW_IGD 0xa001 Pineview Integrated Graphics Device product INTEL PINEVIEW_IGD_1 0xa002 Pineview Integrated Graphics Device @@ -6691,6 +6692,7 @@ product NVIDIA NVS_4200M2 0x1057 GeForce product NVIDIA GEFORCE_610M 0x1058 GeForce 610M product NVIDIA GEFORCE_610M2 0x1059 GeForce 610M product NVIDIA GT610M 0x105A GeForce GT 610M +product NVIDIA GF_GTX680 0x1180 GeForce GTX 680 product NVIDIA GF116 0x1244 GeForce GTX 550 Ti product NVIDIA GF_GTX960 0x1401 GeForce GTX 960 product NVIDIA GF_GTX950 0x1402 GeForce GTX 950 @@ -7083,6 +7085,7 @@ product REALTEK RTS5208 0x5208 RTS5208 product REALTEK RTS5209 0x5209 RTS5209 PCI-E Card Reader product REALTEK RTS5227 0x5227 RTS5227 PCI-E Card Reader product REALTEK RTS5229 0x5229 RTS5229 PCI-E Card Reader +product REALTEK RTS522A 0x522A RTS522A PCI-E Card Reader product REALTEK RTS5249 0x5249 RTS5249 PCI-E Card Reader product REALTEK RTS525A 0x525A RTS525A PCI-E Card Reader product REALTEK RTL8402 0x5286 RTL8402 PCI-E Card Reader Index: src/sys/dev/pci/rtsx_pci.c diff -u src/sys/dev/pci/rtsx_pci.c:1.8 src/sys/dev/pci/rtsx_pci.c:1.8.4.1 --- src/sys/dev/pci/rtsx_pci.c:1.8 Sun Dec 9 11:14:02 2018 +++ src/sys/dev/pci/rtsx_pci.c Tue Apr 28 16:26:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: rtsx_pci.c,v 1.8.4.1 2020/04/28 16:26:44 martin Exp $ */ /* $OpenBSD: rtsx_pci.c,v 1.7 2014/08/19 17:55:03 phessler Exp $ */ @@ -20,7 +20,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.8.4.1 2020/04/28 16:26:44 martin Exp $"); #include #include @@ -79,6 +79,7 @@ rtsx_pci_match(device_t parent, cfdata_t case PCI_PRODUCT_REALTEK_RTS5209: case PCI_PRODUCT_REALTEK_RTS5227: case PCI_PRODUCT_REALTEK_RTS5229: + case PCI_PRODUCT_REALTEK_RTS522A: case PCI_PRODUCT_REALTEK_RTS525A: case PCI_PRODUCT_REALTEK
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 28 16:30:35 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #863 and #864 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.44 src/doc/CHANGES-9.1:1.1.2.45 --- src/doc/CHANGES-9.1:1.1.2.44 Tue Apr 28 16:15:34 2020 +++ src/doc/CHANGES-9.1 Tue Apr 28 16:30:35 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.44 2020/04/28 16:15:34 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.45 2020/04/28 16:30:35 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -2265,3 +2265,20 @@ usr.bin/calendar/calendars/calendar.netb Sync calendars with HEAD. [sevan, ticket #859] +sys/dev/pckbport/synaptics.c 1.65 +sys/dev/pckbport/synapticsvar.h 1.10 + + pms(4): synaptics: fix extended button reporting. + [jmcneill, ticket #863] + +share/man/man4/rtsx.41.6 +sys/dev/pci/pcidevs1.1410 +sys/dev/pci/rtsx_pci.c1.9 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + Add an eclectic mix of GeForce GTX 680, RTS522A PCI-E Card Reader, + intel wifi 9560. + Add support for Realtek RTS522A. + [jmcneill, ticket #864] +
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Tue Apr 28 17:15:48 UTC 2020 Modified Files: src/sys/dev/pci: if_msk.c Log Message: Remove unused cargo cult include of in if_msk.c. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/dev/pci/if_msk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_msk.c diff -u src/sys/dev/pci/if_msk.c:1.101 src/sys/dev/pci/if_msk.c:1.102 --- src/sys/dev/pci/if_msk.c:1.101 Sun Apr 26 16:14:14 2020 +++ src/sys/dev/pci/if_msk.c Tue Apr 28 17:15:48 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.101 2020/04/26 16:14:14 jakllsch Exp $ */ +/* $NetBSD: if_msk.c,v 1.102 2020/04/28 17:15:48 jakllsch Exp $ */ /* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.101 2020/04/26 16:14:14 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.102 2020/04/28 17:15:48 jakllsch Exp $"); #include #include @@ -83,7 +83,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1 #include #include -#include #include #include
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Tue Apr 28 17:26:02 UTC 2020 Modified Files: src/sys/dev/pci: if_msk.c Log Message: Use correct-semantic byteorder(9) functions to provide letoh*() in msk(4) To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/dev/pci/if_msk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_msk.c diff -u src/sys/dev/pci/if_msk.c:1.102 src/sys/dev/pci/if_msk.c:1.103 --- src/sys/dev/pci/if_msk.c:1.102 Tue Apr 28 17:15:48 2020 +++ src/sys/dev/pci/if_msk.c Tue Apr 28 17:26:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.102 2020/04/28 17:15:48 jakllsch Exp $ */ +/* $NetBSD: if_msk.c,v 1.103 2020/04/28 17:26:01 jakllsch Exp $ */ /* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.102 2020/04/28 17:15:48 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.103 2020/04/28 17:26:01 jakllsch Exp $"); #include #include @@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1 #include #include #ifdef __NetBSD__ - #define letoh16 htole16 - #define letoh32 htole32 + #define letoh16 le16toh + #define letoh32 le32toh #endif #include
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Tue Apr 28 17:27:03 UTC 2020
Modified Files:
src/sys/kern: sys_futex.c
src/tests/lib/libc/sys: t_futex_ops.c
Log Message:
Make FUTEX_WAIT_BITSET(bitset=0) fail with EINVAL to match Linux.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_futex.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/sys/t_futex_ops.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/sys_futex.c
diff -u src/sys/kern/sys_futex.c:1.6 src/sys/kern/sys_futex.c:1.7
--- src/sys/kern/sys_futex.c:1.6 Tue Apr 28 16:22:25 2020
+++ src/sys/kern/sys_futex.c Tue Apr 28 17:27:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_futex.c,v 1.6 2020/04/28 16:22:25 riastradh Exp $ */
+/* $NetBSD: sys_futex.c,v 1.7 2020/04/28 17:27:03 riastradh Exp $ */
/*-
* Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.6 2020/04/28 16:22:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.7 2020/04/28 17:27:03 riastradh Exp $");
/*
* Futexes
@@ -1202,7 +1202,7 @@ futex_func_wait(bool shared, int *uaddr,
* us, then don't set anything up to wait -- just stop here.
*/
if (val3 == 0)
- return 0;
+ return EINVAL;
/* Optimistically test before anything else. */
if (!futex_test(uaddr, val))
Index: src/tests/lib/libc/sys/t_futex_ops.c
diff -u src/tests/lib/libc/sys/t_futex_ops.c:1.1 src/tests/lib/libc/sys/t_futex_ops.c:1.2
--- src/tests/lib/libc/sys/t_futex_ops.c:1.1 Sun Apr 26 18:53:33 2020
+++ src/tests/lib/libc/sys/t_futex_ops.c Tue Apr 28 17:27:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_futex_ops.c,v 1.1 2020/04/26 18:53:33 thorpej Exp $ */
+/* $NetBSD: t_futex_ops.c,v 1.2 2020/04/28 17:27:03 riastradh Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2019, 2020\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_futex_ops.c,v 1.1 2020/04/26 18:53:33 thorpej Exp $");
+__RCSID("$NetBSD: t_futex_ops.c,v 1.2 2020/04/28 17:27:03 riastradh Exp $");
#include
#include
@@ -632,9 +632,9 @@ ATF_TC_BODY(futex_wait_pointless_bitset,
{
futex_word = 1;
- /* This won't block because no bits are set. */
- ATF_REQUIRE(__futex(&futex_word, FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG,
- 1, NULL, NULL, 0, 0) == 0);
+ ATF_REQUIRE_ERRNO(EINVAL,
+ __futex(&futex_word, FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG,
+ 1, NULL, NULL, 0, 0) == -1);
}
static void
CVS commit: [netbsd-9] src/share/misc
Module Name:src
Committed By: martin
Date: Tue Apr 28 18:00:56 UTC 2020
Modified Files:
src/share/misc [netbsd-9]: acronyms acronyms.comp inter.phone
Log Message:
Pull up following revision(s) (requested by sevan):
share/misc/acronyms.comp: revision 1.295
share/misc/acronyms.comp: revision 1.296
share/misc/acronyms.comp: revision 1.297
share/misc/acronyms.comp: revision 1.298
share/misc/acronyms.comp: revision 1.299
share/misc/acronyms: revision 1.292
share/misc/acronyms: revision 1.293
share/misc/acronyms: revision 1.294
share/misc/acronyms: revision 1.295
share/misc/acronyms: revision 1.296
share/misc/acronyms: revision 1.297
share/misc/acronyms: revision 1.298
share/misc/acronyms: revision 1.299
share/misc/acronyms.comp: revision 1.300
share/misc/acronyms.comp: revision 1.301
share/misc/inter.phone: revision 1.33
Add WP
>From Rocky Hotas, thanks!
CCC, CPA, MDMA, SEO, WLW
SEO - already in comp
move some more to comp
Typo - heads up by Thorsten Glaser
LAG, MLAG, the G is for group, adjust MCLAG
Add RIF (reduction in force).
SSTP
Add TLDW
>From Rocky Hotas, thanks!
Add HPD
>From Rocky Hotas, thanks!
New Greek National Numbering Plan, according to the EETT decision published
in the Greek Government Gazette 127 B/8.2.2001
Add RFI, RFP
EPT extended page tables
SCSI OSD
PCBC
To generate a diff of this commit:
cvs rdiff -u -r1.287.2.1 -r1.287.2.2 src/share/misc/acronyms
cvs rdiff -u -r1.283.2.1 -r1.283.2.2 src/share/misc/acronyms.comp
cvs rdiff -u -r1.31 -r1.31.2.1 src/share/misc/inter.phone
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.287.2.1 src/share/misc/acronyms:1.287.2.2
--- src/share/misc/acronyms:1.287.2.1 Tue Dec 24 17:42:18 2019
+++ src/share/misc/acronyms Tue Apr 28 18:00:56 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.287.2.1 2019/12/24 17:42:18 martin Exp $
+$NetBSD: acronyms,v 1.287.2.2 2020/04/28 18:00:56 martin Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -44,7 +44,7 @@ ATEOTD at the end of the day
ATM at the moment
ATM {automated,automatic} teller machine
ATW around the world
-AVB alcohol by volume
+ABV alcohol by volume
AVI automatic vehicle identification
AWK Aho, Weinberger, [and] Kernighan
AWOL absent without official leave
@@ -100,6 +100,7 @@ CMIIW correct me if I'm wrong
CNP continued [in my] next post
COB close of business [day]
COTS commercial off-the-shelf
+CPA cyproterone acetate
CPC cost per click
CPE customer premises equipment
CPR car plate recognition
@@ -346,6 +347,7 @@ M&O management & operations
M8 mate
MAD mutually assured destruction
MBA master of business administration
+MDMA methylenedioxy methamphetamine
MFW my face when
MIA missing in action
MLPR mobile license plate reader
@@ -470,6 +472,9 @@ RCD residual current device
RFC request for comments
RFD request for discussion
RFE request for enhancements
+RFI request for information
+RFP request for proposal
+RIF reduction in force
RIP rest in peace
RL real life
RLC rod length check
@@ -545,6 +550,7 @@ TLA three letter acronym
TLA true love always
TLC tender loving care
TLDR too long, didn't read
+TLDW too long, didn't watch
TM trademark
TM trust me
TMA too many abbreviations
@@ -599,8 +605,10 @@ WFH working from home
WFM works for me
WIBNI wouldn't it be nice if
WIP work in progress
+WLW women-loving women
WMNC watch me not care
WOMBAT waste of money, brain, and time
+WP well played
WRR weighted round robin
WRT with respect to
WTB {waiting,want,willing} to buy
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.283.2.1 src/share/misc/acronyms.comp:1.283.2.2
--- src/share/misc/acronyms.comp:1.283.2.1 Tue Dec 24 17:42:18 2019
+++ src/share/misc/acronyms.comp Tue Apr 28 18:00:56 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.283.2.1 2019/12/24 17:42:18 martin Exp $
+$NetBSD: acronyms.comp,v 1.283.2.2 2020/04/28 18:00:56 martin Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -214,6 +214,7 @@ CAV constant angular velocity
CBC cipher block chaining
CBR constant bit rate
CC carbon copy
+CCC Chaos Computer Club
CCD charge coupled device
CCI co-channel interferer
CCNUMA cache-coherent non-uniform memory access
@@ -282,6 +283,7 @@ CORBA common object request broker archi
COS class of service
COW copy-on-write
CP continuous pilot
+CPA chosen-plaintext attack
CPB core performance boost
CPC central processor complex
CPC cpu performance counters
@@ -532,6 +534,7 @@ EPIC explicitly parallel instruction com
EPP enhanced parallel port
EPRML extended partial response, maximum likelihood
EPROM erasable programmable read only memory
+EPT extended page tables
ERC error recovery control
CVS commit: [netbsd-9] src/share/misc
Module Name:src Committed By: martin Date: Tue Apr 28 18:06:24 UTC 2020 Modified Files: src/share/misc [netbsd-9]: bsd-family-tree Log Message: Pull up following revision(s) (requested by sevan in ticket #861): share/misc/bsd-family-tree: revision 1.80 share/misc/bsd-family-tree: revision 1.81 share/misc/bsd-family-tree: revision 1.78 share/misc/bsd-family-tree: revision 1.79 Sync with FreeBSD r358254 Sync with r358264 which fixes NetBSD 9.0 release Update to r359157 from FreeBSD Sync with FreeBSD r359561 To generate a diff of this commit: cvs rdiff -u -r1.75.2.1 -r1.75.2.2 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.75.2.1 src/share/misc/bsd-family-tree:1.75.2.2 --- src/share/misc/bsd-family-tree:1.75.2.1 Tue Dec 24 17:39:23 2019 +++ src/share/misc/bsd-family-tree Tue Apr 28 18:06:24 2020 @@ -388,24 +388,31 @@ FreeBSD 5.2 | | || | | | | |DragonFly 5.2.2 | FreeBSD| | | *--NetBSD || | 11.2 | | | 7.2|| - || macOS| | | || - || 10.14| | | OpenBSD 6.4 | - || | | | | || - || | | | | |DragonFly 5.4.0 - *--FreeBSD | | | | v || + || macOS| ||| + || 10.14| |OpenBSD 6.4 | + || | | ||| + || | | ||DragonFly 5.4.0 + *--FreeBSD | | | ||| | 12.0 | | | ||DragonFly 5.4.1 | | | | | |OpenBSD 6.5 | | | | | | ||| | | | | | NetBSD|| | | | | | 8.1 |DragonFly 5.6 - | | | | ||| - | | | | ||DragonFly 5.6.1 - | | FreeBSD macOS||| - | | 11.3 10.15||| - | FreeBSD | |OpenBSD 6.6 | - | 12.1 macOS||| - | | 10.15.1 ||DragonFly 5.6.2 - | v | ||| + | | | | | ||| + | | | | | ||DragonFly 5.6.1 + | | FreeBSD macOS| ||| + | | 11.3 10.15| ||| + | FreeBSD | | |OpenBSD 6.6 | + | 12.1 macOS| `---.|| + | | 10.15.1 | ||DragonFly 5.6.2 + | | | *--NetBSD ||| + | v | | 9.0 ||| + || | ||| + || | ||DragonFly 5.8 + || | ||| + || | ||DragonFly 5.6.3 + || |NetBSD || + || | 8.2|| || ||| FreeBSD 13 -current | NetBSD -current OpenBSD -currentDragonFly -current || ||| @@ -798,6 +805,10 @@ OpenBSD 6.6 2019-10-17 [OBD] macOS 10.15 2019-10-07 [APL] macOS 10.15.1 2019-10-29 [APL] (security/critical release) FreeBSD 12.1 2019-11-04 [FBD] +NetBSD 9.0 2020-02-14 [NBD] +DragonFly 5.8 2020-03-03 [DFB] +DragonFly 5.6.3 2020-03-11 [DFB] +NetBSD 8.2 2020-03-31 [NBD] Bibliography @@ -862,5 +873,5 @@ Steven M. Schultz for providing 2.8BSD, Copyright (c) 1997-2012 Wolfram Schneider URL: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree -$FreeBSD: head/share/mis
CVS commit: [netbsd-9] src/share/misc
Module Name:src Committed By: martin Date: Tue Apr 28 18:10:48 UTC 2020 Modified Files: src/share/misc [netbsd-9]: airport inter.phone Log Message: Pull up following revision(s) (requested by sevan in ticket #862): share/misc/airport: revision 1.68 share/misc/inter.phone: revision 1.32 Fix area code for Czestochowa and add area code for Tarnow. While there, fix names for some other Polish cities. Add LUZ and WMI airports (Poland). To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.67.6.1 src/share/misc/airport cvs rdiff -u -r1.31.2.1 -r1.31.2.2 src/share/misc/inter.phone Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.67 src/share/misc/airport:1.67.6.1 --- src/share/misc/airport:1.67 Fri Sep 15 19:20:11 2017 +++ src/share/misc/airport Tue Apr 28 18:10:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.67 2017/09/15 19:20:11 mbalmer Exp $ +# $NetBSD: airport,v 1.67.6.1 2020/04/28 18:10:48 martin Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -4466,6 +4466,7 @@ LUU:Laura, Queensland, Australia LUV:Langgur/Tual, Indonesia LUW:Luwuk, Indonesia LUX:Luxembourg (Findel), Luxembourg +LUZ:Lublin (Swidnik), Poland LVA:Laval, France LVB:Santana do Livramento, RS, Brazil LVD:Lime Village Airport, AK, USA @@ -8412,6 +8413,7 @@ WMC:Winnemucca, NV, USA WMD:Mandabe, Madagascar WME:Warramboor, Western Australia, Australia WMH:Mountain Home (Baxter County), AR, USA +WMI:Warsaw (Nowy Dwor Mazowiecki), Poland WMK:Meyers Chuck (Seaplane Base), AK, USA WML:Malaimbandy, Madagascar WMN:Maroantsetra, Madagascar Index: src/share/misc/inter.phone diff -u src/share/misc/inter.phone:1.31.2.1 src/share/misc/inter.phone:1.31.2.2 --- src/share/misc/inter.phone:1.31.2.1 Tue Apr 28 18:00:56 2020 +++ src/share/misc/inter.phone Tue Apr 28 18:10:48 2020 @@ -1,5 +1,5 @@ # Country Code : City Code : City : Country -# $NetBSD: inter.phone,v 1.31.2.1 2020/04/28 18:00:56 martin Exp $ +# $NetBSD: inter.phone,v 1.31.2.2 2020/04/28 18:10:48 martin Exp $ # @(#)inter.phone 8.1 (Berkeley) 6/9/93 7:317:Akmola:Republic of Kazakhstan 7:329:Aktau:Republic of Kazakhstan @@ -184,6 +184,7 @@ 47:7:Trondheim:Norway 48:12:Cracow:Poland 48:13:Krosno:Poland +48:14:Tarnow:Poland 48:15:Tarnobrzeg:Poland 48:16:Przemysl:Poland 48:17:Rzeszow:Poland @@ -194,12 +195,12 @@ 48:25:Siedlce:Poland 48:29:Ostroleka:Poland 48:32:Katowice:Poland -48:33:Bielsko Biala:Poland -48:33:Czestochowa:Poland +48:33:Bielsko-Biala:Poland +48:34:Czestochowa:Poland 48:41:Kielce:Poland 48:42:Lodz:Poland 48:43:Sieradz:Poland -48:44:Piotrkow:Poland +48:44:Piotrkow Trybunalski:Poland 48:46:Skierniewice:Poland 48:48:Radom:Poland 48:52:Bydgoszcz:Poland @@ -229,7 +230,7 @@ 48:89:Olsztyn:Poland 48:91:Szczecin:Poland 48:94:Koszalin:Poland -48:95:Gorzow:Poland +48:95:Gorzow Wielkopolski:Poland 49:201:Essen:Germany, Fed. Rep. of 49:202:Wuppertal:Germany, Fed. Rep. of 49:203:Duisburg:Germany, Fed. Rep. of
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Apr 28 18:13:50 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #860 - #862 To generate a diff of this commit: cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-9.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.45 src/doc/CHANGES-9.1:1.1.2.46 --- src/doc/CHANGES-9.1:1.1.2.45 Tue Apr 28 16:30:35 2020 +++ src/doc/CHANGES-9.1 Tue Apr 28 18:13:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.45 2020/04/28 16:30:35 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.46 2020/04/28 18:13:49 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -2282,3 +2282,21 @@ sys/dev/pci/pcidevs_data.h (regen) Add support for Realtek RTS522A. [jmcneill, ticket #864] +share/misc/acronyms1.292-1.299 +share/misc/acronyms.comp 1.295-1.301 +share/misc/inter.phone1.33 + + Sync acronyms with HEAD. + [sevan, ticket #860] + +share/misc/bsd-family-tree 1.78-1.81 + + Update to r359561 from FreeBSD. + [sevan, ticket #861] + +share/misc/airport1.68 +share/misc/inter.phone1.32 + + Fix some polish entries. + [sevan, ticket #862] +
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: jmcneill Date: Tue Apr 28 19:22:58 UTC 2020 Modified Files: src/sys/dev/pckbport: synaptics.c Log Message: pms_synaptics_enable: no need to send PMS_DEV_ENABLE here because pms_enable does this for us. Seems to resolve issues with my trackpoint not working immediately after starting X on ThinkPad X260. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c diff -u src/sys/dev/pckbport/synaptics.c:1.65 src/sys/dev/pckbport/synaptics.c:1.66 --- src/sys/dev/pckbport/synaptics.c:1.65 Mon Apr 27 22:31:47 2020 +++ src/sys/dev/pckbport/synaptics.c Tue Apr 28 19:22:58 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: synaptics.c,v 1.65 2020/04/27 22:31:47 jmcneill Exp $ */ +/* $NetBSD: synaptics.c,v 1.66 2020/04/28 19:22:58 jmcneill Exp $ */ /* * Copyright (c) 2005, Steve C. Woodford @@ -48,7 +48,7 @@ #include "opt_pms.h" #include -__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.65 2020/04/27 22:31:47 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.66 2020/04/28 19:22:58 jmcneill Exp $"); #include #include @@ -484,8 +484,6 @@ pms_synaptics_enable(void *vsc) (sc->flags & SYN_FLAG_HAS_ADV_GESTURE_MODE)) synaptics_special_write(psc, SYNAPTICS_WRITE_DELUXE_3, 0x3); - synaptics_poll_cmd(psc, PMS_DEV_ENABLE, 0); - sc->up_down = 0; sc->prev_fingers = 0; sc->gesture_start_x = sc->gesture_start_y = 0;
CVS commit: src/sys/gdbscripts
Module Name:src Committed By: christos Date: Tue Apr 28 19:45:58 UTC 2020 Added Files: src/sys/gdbscripts: modload Log Message: add a script to load the symbol files of all the modules in the kernel To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/gdbscripts/modload Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/gdbscripts/modload diff -u /dev/null src/sys/gdbscripts/modload:1.1 --- /dev/null Tue Apr 28 15:45:58 2020 +++ src/sys/gdbscripts/modload Tue Apr 28 15:45:58 2020 @@ -0,0 +1,14 @@ +# $NetBSD: modload,v 1.1 2020/04/28 19:45:58 christos Exp $ +# Load the symbol files for all active modules +define modload + set $h = module_list + set $e = $h.tqh_first + while ($e != 0) + if ($e->mod_kobj != 0) + set $ko = $e->mod_kobj + set $n = $e->mod_info.mi_name + eval "add-symbol-file %s/%s/%s.kmod -s .text 0x%lx -s .data 0x%lx -s .rodata 0x%lx\n", module_base, $n, $n, $ko->ko_text_address, $ko->ko_data_address, $ko->ko_rodata_address + end + set $e = $e->mod_chain.tqe_next + end +end
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Tue Apr 28 21:35:35 UTC 2020 Modified Files: src/sys/arch/amd64/amd64: machdep.c src/sys/arch/x86/x86: pmap.c Log Message: Detect PAT on the boot processor before cpu0 attaches so the early genfb attach code can map the framebuffer with write combining. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.383 -r1.384 src/sys/arch/x86/x86/pmap.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/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.348 src/sys/arch/amd64/amd64/machdep.c:1.349 --- src/sys/arch/amd64/amd64/machdep.c:1.348 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/amd64/amd64/machdep.c Tue Apr 28 21:35:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.348 2020/04/25 15:26:16 bouyer Exp $ */ +/* $NetBSD: machdep.c,v 1.349 2020/04/28 21:35:35 jmcneill Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -110,7 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.348 2020/04/25 15:26:16 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.349 2020/04/28 21:35:35 jmcneill Exp $"); #include "opt_modular.h" #include "opt_user_ldt.h" @@ -1704,6 +1704,8 @@ init_x86_64(paddr_t first_avail) x86_bus_space_init(); #endif + pat_init(&cpu_info_primary); + consinit(); /* XXX SHOULD NOT BE DONE HERE */ /* Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.383 src/sys/arch/x86/x86/pmap.c:1.384 --- src/sys/arch/x86/x86/pmap.c:1.383 Sat Apr 25 15:26:18 2020 +++ src/sys/arch/x86/x86/pmap.c Tue Apr 28 21:35:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.383 2020/04/25 15:26:18 bouyer Exp $ */ +/* $NetBSD: pmap.c,v 1.384 2020/04/28 21:35:35 jmcneill 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.383 2020/04/25 15:26:18 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.384 2020/04/28 21:35:35 jmcneill Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -923,7 +923,6 @@ pat_init(struct cpu_info *ci) wrmsr(MSR_CR_PAT, pat); cpu_pat_enabled = true; - aprint_debug_dev(ci->ci_dev, "PAT enabled\n"); } static pt_entry_t
CVS commit: src/sys/dev/hdaudio
Module Name:src Committed By: jmcneill Date: Tue Apr 28 21:48:11 UTC 2020 Modified Files: src/sys/dev/hdaudio: hdaudiodevs Log Message: Add Realtek ALC293 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hdaudio/hdaudiodevs 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/hdaudio/hdaudiodevs diff -u src/sys/dev/hdaudio/hdaudiodevs:1.3 src/sys/dev/hdaudio/hdaudiodevs:1.4 --- src/sys/dev/hdaudio/hdaudiodevs:1.3 Mon Jan 27 00:51:15 2020 +++ src/sys/dev/hdaudio/hdaudiodevs Tue Apr 28 21:48:11 2020 @@ -1,4 +1,4 @@ -$NetBSD: hdaudiodevs,v 1.3 2020/01/27 00:51:15 jmcneill Exp $ +$NetBSD: hdaudiodevs,v 1.4 2020/04/28 21:48:11 jmcneill Exp $ /* * Copyright (c) 2010 Jared D. McNeill @@ -77,6 +77,7 @@ product REALTEK ALC270 0x0270 ALC270 product REALTEK ALC272 0x0272 ALC272 product REALTEK ALC275 0x0275 ALC275 product REALTEK ALC280 0x0280 ALC280 +product REALTEK ALC293 0x0293 ALC293 product REALTEK ALC660_VD 0x0660 ALC660-VD product REALTEK ALC662 0x0662 ALC662 product REALTEK ALC663 0x0663 ALC663
CVS commit: src/sys/dev/hdaudio
Module Name:src Committed By: jmcneill Date: Tue Apr 28 21:48:20 UTC 2020 Modified Files: src/sys/dev/hdaudio: hdaudiodevs.h hdaudiodevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hdaudio/hdaudiodevs.h \ src/sys/dev/hdaudio/hdaudiodevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/hdaudio/hdaudiodevs.h diff -u src/sys/dev/hdaudio/hdaudiodevs.h:1.3 src/sys/dev/hdaudio/hdaudiodevs.h:1.4 --- src/sys/dev/hdaudio/hdaudiodevs.h:1.3 Mon Jan 27 00:51:40 2020 +++ src/sys/dev/hdaudio/hdaudiodevs.h Tue Apr 28 21:48:20 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: hdaudiodevs.h,v 1.3 2020/01/27 00:51:40 jmcneill Exp $ */ +/* $NetBSD: hdaudiodevs.h,v 1.4 2020/04/28 21:48:20 jmcneill Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: hdaudiodevs,v 1.3 2020/01/27 00:51:15 jmcneill Exp + * NetBSD: hdaudiodevs,v 1.4 2020/04/28 21:48:11 jmcneill Exp */ /* @@ -84,6 +84,7 @@ #define HDAUDIO_PRODUCT_REALTEK_ALC272 0x0272 /* ALC272 */ #define HDAUDIO_PRODUCT_REALTEK_ALC275 0x0275 /* ALC275 */ #define HDAUDIO_PRODUCT_REALTEK_ALC280 0x0280 /* ALC280 */ +#define HDAUDIO_PRODUCT_REALTEK_ALC293 0x0293 /* ALC293 */ #define HDAUDIO_PRODUCT_REALTEK_ALC660_VD 0x0660 /* ALC660-VD */ #define HDAUDIO_PRODUCT_REALTEK_ALC662 0x0662 /* ALC662 */ #define HDAUDIO_PRODUCT_REALTEK_ALC663 0x0663 /* ALC663 */ Index: src/sys/dev/hdaudio/hdaudiodevs_data.h diff -u src/sys/dev/hdaudio/hdaudiodevs_data.h:1.3 src/sys/dev/hdaudio/hdaudiodevs_data.h:1.4 --- src/sys/dev/hdaudio/hdaudiodevs_data.h:1.3 Mon Jan 27 00:51:40 2020 +++ src/sys/dev/hdaudio/hdaudiodevs_data.h Tue Apr 28 21:48:20 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: hdaudiodevs_data.h,v 1.3 2020/01/27 00:51:40 jmcneill Exp $ */ +/* $NetBSD: hdaudiodevs_data.h,v 1.4 2020/04/28 21:48:20 jmcneill Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: hdaudiodevs,v 1.3 2020/01/27 00:51:15 jmcneill Exp + * NetBSD: hdaudiodevs,v 1.4 2020/04/28 21:48:11 jmcneill Exp */ /* @@ -102,320 +102,322 @@ static const uint16_t hdaudio_products[] 230, 0, HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC280, 237, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC660_VD, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC293, 244, 0, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC660_VD, + 251, 0, HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC662, - 254, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC663, 261, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC670, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC663, 268, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC861, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC670, 275, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC861_VD, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC861, 282, 0, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC861_VD, + 289, 0, HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC880, - 292, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC882, 299, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC883, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC882, 306, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC885, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC883, 313, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC887, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC885, 320, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC888, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC887, 327, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC889, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC888, 334, 0, - HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC892, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC889, 341, 0, - HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1708, + HDAUDIO_VENDOR_REALTEK, HDAUDIO_PRODUCT_REALTEK_ALC892, 348, 0, + HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1708, + 355, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1709, - 348, 0, + 355, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT170A, - 348, 0, + 355, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT170B, - 348, 0, + 355, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1709_10CH_0, - 355, 362, 0, + 362, 369, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1709_10CH_1, - 355, 362, 0, + 362, 369, 0, HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRO
CVS commit: src/usr.bin/locale
Module Name:src
Committed By: ginsbach
Date: Tue Apr 28 22:29:32 UTC 2020
Modified Files:
src/usr.bin/locale: locale.c
Log Message:
Fix spelling errors.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/locale/locale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/locale/locale.c
diff -u src/usr.bin/locale/locale.c:1.8 src/usr.bin/locale/locale.c:1.9
--- src/usr.bin/locale/locale.c:1.8 Fri Jan 20 16:31:30 2012
+++ src/usr.bin/locale/locale.c Tue Apr 28 22:29:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locale.c,v 1.8 2012/01/20 16:31:30 joerg Exp $ */
+/* $NetBSD: locale.c,v 1.9 2020/04/28 22:29:32 ginsbach Exp $ */
/*-
* Copyright (c) 2002, 2003 Alexey Zelkin
@@ -30,7 +30,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: locale.c,v 1.8 2012/01/20 16:31:30 joerg Exp $");
+__RCSID("$NetBSD: locale.c,v 1.9 2020/04/28 22:29:32 ginsbach Exp $");
#endif /* LIBC_SCCS and not lint */
/*
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
/* validate arguments */
if (all_locales && all_charmaps)
usage();
- if ((all_locales || all_charmaps) && argc > 0)
+ if ((all_locales || all_charmaps) && argc > 0)
usage();
if ((all_locales || all_charmaps) && (prt_categories || prt_keywords))
usage();
@@ -335,8 +335,8 @@ scmp(const void *s1, const void *s2)
/*
* Output information about all available charmaps
*
- * XXX this function is doing a task in hackish way, i.e. by scaning
- * list of locales, spliting their codeset part and building list of
+ * XXX this function is doing a task in hackish way, i.e. by scanning
+ * list of locales, splitting their codeset part and building list of
* them.
*/
void
@@ -423,7 +423,7 @@ init_locales_list(void)
/* make sure that 'POSIX' and 'C' locales are present in the list.
* POSIX 1003.1-2001 requires presence of 'POSIX' name only here, but
- * we also list 'C' for constistency
+ * we also list 'C' for consistency
*/
if (sl_find(locales, "POSIX") == NULL)
sl_add(locales, "POSIX");
@@ -498,10 +498,10 @@ showlocale(void)
&& strcmp(lang, vval)) {
/*
* Appropriate environment variable set, its value
- * is valid and not overriden by LC_ALL
+ * is valid and not overridden by LC_ALL
*
* XXX: possible side effect: if both LANG and
- * overriden environment variable are set into same
+ * overridden environment variable are set into same
* value, then it'll be assumed as 'implied'
*/
printf("%s=\"%s\"\n", lcinfo[i].name, vval);
CVS commit: src/sys/compat
Module Name:src
Committed By: thorpej
Date: Wed Apr 29 01:44:03 UTC 2020
Modified Files:
src/sys/compat/linux/common: linux_futex.c
src/sys/compat/linux32/common: linux32_misc.c
Log Message:
Oops, fix a silly mistake in the Linux futex syscall stubs -- we also
copy in the timeout for FUTEX_WAIT_BITSET.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/linux/common/linux_futex.c
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux32/common/linux32_misc.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/compat/linux/common/linux_futex.c
diff -u src/sys/compat/linux/common/linux_futex.c:1.39 src/sys/compat/linux/common/linux_futex.c:1.40
--- src/sys/compat/linux/common/linux_futex.c:1.39 Sun Apr 26 18:53:33 2020
+++ src/sys/compat/linux/common/linux_futex.c Wed Apr 29 01:44:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_futex.c,v 1.39 2020/04/26 18:53:33 thorpej Exp $ */
+/* $NetBSD: linux_futex.c,v 1.40 2020/04/29 01:44:03 thorpej Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.39 2020/04/26 18:53:33 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.40 2020/04/29 01:44:03 thorpej Exp $");
#include
#include
@@ -66,9 +66,11 @@ linux_sys_futex(struct lwp *l, const str
/*
* Linux overlays the "timeout" field and the "val2" field.
- * "timeout" is only valid for FUTEX_WAIT on Linux.
+ * "timeout" is only valid for FUTEX_WAIT and FUTEX_WAIT_BITSET
+ * on Linux.
*/
- if ((SCARG(uap, op) & FUTEX_CMD_MASK) == FUTEX_WAIT &&
+ const int op = (SCARG(uap, op) & FUTEX_CMD_MASK);
+ if ((op == FUTEX_WAIT || op == FUTEX_WAIT_BITSET) &&
SCARG(uap, timeout) != NULL) {
if ((error = copyin(SCARG(uap, timeout),
CVS commit: src/sys
Module Name:src
Committed By: thorpej
Date: Wed Apr 29 01:52:26 UTC 2020
Modified Files:
src/sys/kern: kern_lwp.c kern_proc.c
src/sys/sys: lwp.h proc.h
Log Message:
- proc_find() retains traditional semantics of requiring the canonical
PID to look up a proc. Add a separate proc_find_lwpid() to look up a
proc by the ID of any of its LWPs.
- Add proc_find_lwp_acquire_proc(), which enables looking up the LWP
*and* a proc given the ID of any LWP. Returns with the proc::p_lock
held.
- Rewrite lwp_find2() in terms of proc_find_lwp_acquire_proc(), and add
allow the proc to be wildcarded, rather than just curproc or specific
proc.
- lwp_find2() now subsumes the original intent of lwp_getref_lwpid(), but
in a much nicer way, so garbage-collect the remnants of that recently
added mechanism.
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.250 -r1.251 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.208 -r1.209 src/sys/sys/lwp.h
cvs rdiff -u -r1.363 -r1.364 src/sys/sys/proc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.236 src/sys/kern/kern_lwp.c:1.237
--- src/sys/kern/kern_lwp.c:1.236 Sun Apr 26 18:53:33 2020
+++ src/sys/kern/kern_lwp.c Wed Apr 29 01:52:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.236 2020/04/26 18:53:33 thorpej Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.237 2020/04/29 01:52:26 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -223,7 +223,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.236 2020/04/26 18:53:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.237 2020/04/29 01:52:26 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -266,32 +266,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v
static pool_cache_t lwp_cache __read_mostly;
struct lwplist alllwp __cacheline_aligned;
-/*
- * Lookups by global thread ID operate outside of the normal LWP
- * locking protocol.
- *
- * => When we look up an LWP in the table, we take lwp_threadid_lock as
- *a READER. While still holding the lock, we add a reference to
- *the LWP (using atomics). After adding the reference, we drop the
- *lwp_threadid_lock. We now take p_lock and check the state of the
- *LWP. If the LWP is draining its references, we drop the reference
- *we took and return NULL. Otherwise, the lookup has succeeded and
- *the LWP is returned with a reference count that the caller is
- *responsible for dropping.
- *
- * => When a LWP is exiting, it also drains off any references being
- *held by others. However, the reference in the lookup path is taken
- *outside the normal locking protocol. There needs to be additional
- *serialization so that EITHER lwp_drainrefs() sees the incremented
- *reference count so that it knows to wait, OR lwp_getref_lwpid() sees
- *that the LWP is waiting to drain and thus drops the reference
- *immediately. This is achieved by taking lwp_threadid_lock as a
- *WRITER when setting LPR_DRAINING. Note the locking order:
- *
- * p_lock -> lwp_threadid_lock
- */
-static krwlock_t lwp_threadid_lock __cacheline_aligned;
-
static void lwp_dtor(void *, void *);
/* DTrace proc provider probes */
@@ -325,7 +299,6 @@ struct lwp lwp0 __aligned(MIN_LWP_ALIGNM
.l_fd = &filedesc0,
};
-static void lwp_threadid_init(void);
static int sysctl_kern_maxlwp(SYSCTLFN_PROTO);
/*
@@ -378,7 +351,6 @@ lwpinit(void)
maxlwp = cpu_maxlwp();
sysctl_kern_lwp_setup();
- lwp_threadid_init();
}
void
@@ -1405,10 +1377,20 @@ lwp_migrate(lwp_t *l, struct cpu_info *t
lwp_unlock(l);
}
+#define lwp_find_exclude(l) \
+ ((l)->l_stat == LSIDL || (l)->l_stat == LSZOMB)
+
/*
* Find the LWP in the process. Arguments may be zero, in such case,
* the calling process and first LWP in the list will be used.
* On success - returns proc locked.
+ *
+ * => pid == 0 -> look in curproc.
+ * => pid == -1 -> match any proc.
+ * => otherwise look up the proc.
+ *
+ * => lid == 0 -> first LWP in the proc
+ * => otherwise specific LWP
*/
struct lwp *
lwp_find2(pid_t pid, lwpid_t lid)
@@ -1416,27 +1398,62 @@ lwp_find2(pid_t pid, lwpid_t lid)
proc_t *p;
lwp_t *l;
- /* Find the process. */
- if (pid != 0) {
- mutex_enter(proc_lock);
- p = proc_find(pid);
- if (p == NULL) {
- mutex_exit(proc_lock);
+ /* First LWP of specified proc. */
+ if (lid == 0) {
+ switch (pid) {
+ case -1:
+ /* No lookup keys. */
return NULL;
+ case 0:
+ p = curproc;
+ mutex_enter(p->p_lock);
+ break;
+ default:
+ mutex_enter(proc_lock);
+ p = proc_find(pid);
+ if (__predict_false(p == NULL)) {
+mutex_exit(proc_lock);
+return NULL;
+ }
+ mutex_enter(p->p_lock);
+ mutex_exit(proc_lock);
+ break;
}
- mutex_
CVS commit: src/sys/kern
Module Name:src Committed By: thorpej Date: Wed Apr 29 01:53:48 UTC 2020 Modified Files: src/sys/kern: sys_sched.c Log Message: Sanitize the pid and lid arguments passed to do_sched_getparam() and sys__sched_getaffinity() now that -1 as the pid argument to lwp_find2() means "wildcard proc". To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/kern/sys_sched.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/sys_sched.c diff -u src/sys/kern/sys_sched.c:1.47 src/sys/kern/sys_sched.c:1.48 --- src/sys/kern/sys_sched.c:1.47 Mon Jan 27 22:05:10 2020 +++ src/sys/kern/sys_sched.c Wed Apr 29 01:53:48 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $ */ +/* $NetBSD: sys_sched.c,v 1.48 2020/04/29 01:53:48 thorpej Exp $ */ /* * Copyright (c) 2008, 2011 Mindaugas Rasiukevicius @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.48 2020/04/29 01:53:48 thorpej Exp $"); #include @@ -231,6 +231,9 @@ do_sched_getparam(pid_t pid, lwpid_t lid struct lwp *t; int error, lpolicy; + if (pid < 0 || lid < 0) + return EINVAL; + t = lwp_find2(pid, lid); /* acquire p_lock */ if (t == NULL) return ESRCH; @@ -498,6 +501,9 @@ sys__sched_getaffinity(struct lwp *l, kcpuset_t *kcset; int error; + if (SCARG(uap, pid) < 0 || SCARG(uap, lid) < 0) + return EINVAL; + error = genkcpuset(&kcset, SCARG(uap, cpuset), SCARG(uap, size)); if (error) return error;
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: thorpej
Date: Wed Apr 29 01:55:18 UTC 2020
Modified Files:
src/sys/compat/linux/common: linux_sched.c
Log Message:
Fix proc / lwp lookup processing in linux_sys_sched_getaffinity()
and linux_sys_sched_setaffinity(). They were incorrect even before
the LWP ID changes, but those changes exposed the latent bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/compat/linux/common/linux_sched.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/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.75 src/sys/compat/linux/common/linux_sched.c:1.76
--- src/sys/compat/linux/common/linux_sched.c:1.75 Fri Apr 24 03:22:06 2020
+++ src/sys/compat/linux/common/linux_sched.c Wed Apr 29 01:55:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.75 2020/04/24 03:22:06 thorpej Exp $ */
+/* $NetBSD: linux_sched.c,v 1.76 2020/04/29 01:55:18 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.75 2020/04/24 03:22:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.76 2020/04/29 01:55:18 thorpej Exp $");
#include
#include
@@ -608,6 +608,7 @@ linux_sys_sched_getaffinity(struct lwp *
syscallarg(unsigned int) len;
syscallarg(unsigned long *) mask;
} */
+ struct proc *p;
struct lwp *t;
kcpuset_t *kcset;
size_t size;
@@ -618,15 +619,23 @@ linux_sys_sched_getaffinity(struct lwp *
if (SCARG(uap, len) < size)
return EINVAL;
- /* Lock the LWP */
- t = lwp_find2(SCARG(uap, pid), l->l_lid);
- if (t == NULL)
- return ESRCH;
+ if (SCARG(uap, pid) == 0) {
+ p = curproc;
+ mutex_enter(p->p_lock);
+ t = curlwp;
+ } else {
+ t = lwp_find2(-1, SCARG(uap, pid));
+ if (__predict_false(t == NULL)) {
+ return ESRCH;
+ }
+ p = t->l_proc;
+ KASSERT(mutex_owned(p->p_lock));
+ }
/* Check the permission */
if (kauth_authorize_process(l->l_cred,
- KAUTH_PROCESS_SCHEDULER_GETAFFINITY, t->l_proc, NULL, NULL, NULL)) {
- mutex_exit(t->l_proc->p_lock);
+ KAUTH_PROCESS_SCHEDULER_GETAFFINITY, p, NULL, NULL, NULL)) {
+ mutex_exit(p->p_lock);
return EPERM;
}
@@ -644,7 +653,7 @@ linux_sys_sched_getaffinity(struct lwp *
kcpuset_set(kcset, i);
}
lwp_unlock(t);
- mutex_exit(t->l_proc->p_lock);
+ mutex_exit(p->p_lock);
error = kcpuset_copyout(kcset, (cpuset_t *)SCARG(uap, mask), size);
kcpuset_unuse(kcset, NULL);
*retval = size;
@@ -661,13 +670,28 @@ linux_sys_sched_setaffinity(struct lwp *
} */
struct sys__sched_setaffinity_args ssa;
size_t size;
+ pid_t pid;
size = LINUX_CPU_MASK_SIZE;
if (SCARG(uap, len) < size)
return EINVAL;
- SCARG(&ssa, pid) = SCARG(uap, pid);
- SCARG(&ssa, lid) = l->l_lid;
+ if (SCARG(uap, pid) != 0) {
+ /* Get the canonical PID for the process. */
+ mutex_enter(proc_lock);
+ struct proc *p = proc_find_lwpid(SCARG(uap, pid));
+ if (p == NULL) {
+ mutex_exit(proc_lock);
+ return ESRCH;
+ }
+ pid = p->p_pid;
+ mutex_exit(proc_lock);
+ } else {
+ pid = 0;
+ }
+
+ SCARG(&ssa, pid) = pid;
+ SCARG(&ssa, lid) = SCARG(uap, pid);
SCARG(&ssa, size) = size;
SCARG(&ssa, cpuset) = (cpuset_t *)SCARG(uap, mask);
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: thorpej
Date: Wed Apr 29 01:55:52 UTC 2020
Modified Files:
src/sys/compat/linux/common: linux_signal.c
Log Message:
Fix proc lookup by distinguishing between the "tgid" and "tid" cases.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/common/linux_signal.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/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.81 src/sys/compat/linux/common/linux_signal.c:1.82
--- src/sys/compat/linux/common/linux_signal.c:1.81 Fri Aug 23 08:31:11 2019
+++ src/sys/compat/linux/common/linux_signal.c Wed Apr 29 01:55:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.81 2019/08/23 08:31:11 maxv Exp $ */
+/* $NetBSD: linux_signal.c,v 1.82 2020/04/29 01:55:52 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.81 2019/08/23 08:31:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.82 2020/04/29 01:55:52 thorpej Exp $");
#define COMPAT_LINUX 1
@@ -749,10 +749,6 @@ linux_do_tkill(struct lwp *l, int tgid,
return EINVAL;
signum = linux_to_native_signo[signum];
- if (tgid == -1) {
- tgid = tid;
- }
-
KSI_INIT(&ksi);
ksi.ksi_signo = signum;
ksi.ksi_code = SI_LWP;
@@ -761,7 +757,10 @@ linux_do_tkill(struct lwp *l, int tgid,
ksi.ksi_lid = tid;
mutex_enter(proc_lock);
- p = proc_find(tgid);
+ if (tgid != -1)
+ p = proc_find(tgid);
+ else
+ p = proc_find_lwpid(tid);
if (p == NULL) {
mutex_exit(proc_lock);
return ESRCH;
CVS commit: src/sys/miscfs/procfs
Module Name:src
Committed By: thorpej
Date: Wed Apr 29 01:56:54 UTC 2020
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_subr.c procfs_vfsops.c
procfs_vnops.c
Log Message:
If the procfs mount is marked as linux-compat, then allow proc lookup
by any LWP ID in the proc, not just the canonical PID.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.114 -r1.115 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.107 -r1.108 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.211 -r1.212 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.78 src/sys/miscfs/procfs/procfs.h:1.79
--- src/sys/miscfs/procfs/procfs.h:1.78 Fri Jan 17 20:08:09 2020
+++ src/sys/miscfs/procfs/procfs.h Wed Apr 29 01:56:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.78 2020/01/17 20:08:09 ad Exp $ */
+/* $NetBSD: procfs.h,v 1.79 2020/04/29 01:56:54 thorpej Exp $ */
/*
* Copyright (c) 1993
@@ -209,7 +209,9 @@ struct vfs_namemap {
int vfs_getuserstr(struct uio *, char *, int *);
const vfs_namemap_t *vfs_findname(const vfs_namemap_t *, const char *, int);
-int procfs_proc_lock(int, struct proc **, int);
+struct proc *procfs_proc_find(struct mount *, pid_t);
+bool procfs_use_linux_compat(struct mount *);
+int procfs_proc_lock(struct mount *, int, struct proc **, int);
void procfs_proc_unlock(struct proc *);
struct mount;
int procfs_allocvp(struct mount *, struct vnode **, pid_t, pfstype, int);
Index: src/sys/miscfs/procfs/procfs_subr.c
diff -u src/sys/miscfs/procfs/procfs_subr.c:1.114 src/sys/miscfs/procfs/procfs_subr.c:1.115
--- src/sys/miscfs/procfs/procfs_subr.c:1.114 Thu Sep 26 17:34:08 2019
+++ src/sys/miscfs/procfs/procfs_subr.c Wed Apr 29 01:56:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_subr.c,v 1.114 2019/09/26 17:34:08 christos Exp $ */
+/* $NetBSD: procfs_subr.c,v 1.115 2020/04/29 01:56:54 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.114 2019/09/26 17:34:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.115 2020/04/29 01:56:54 thorpej Exp $");
#include
#include
@@ -152,7 +152,8 @@ procfs_rw(void *v)
if (uio->uio_offset < 0)
return EINVAL;
- if ((error = procfs_proc_lock(pfs->pfs_pid, &p, ESRCH)) != 0)
+ if ((error =
+ procfs_proc_lock(vp->v_mount, pfs->pfs_pid, &p, ESRCH)) != 0)
return error;
curl = curlwp;
@@ -408,8 +409,25 @@ procfs_revoke_vnodes(struct proc *p, voi
vfs_vnode_iterator_destroy(marker);
}
+bool
+procfs_use_linux_compat(struct mount *mp)
+{
+ const int flags = VFSTOPROC(mp)->pmnt_flags;
+
+ return (flags & PROCFSMNT_LINUXCOMPAT) ? true : false;
+}
+
+struct proc *
+procfs_proc_find(struct mount *mp, pid_t pid)
+{
+ KASSERT(mutex_owned(proc_lock));
+ return procfs_use_linux_compat(mp) ? proc_find_lwpid(pid)
+ : proc_find(pid);
+}
+
int
-procfs_proc_lock(int pid, struct proc **bunghole, int notfound)
+procfs_proc_lock(struct mount *mp, int pid, struct proc **bunghole,
+ int notfound)
{
struct proc *tp;
int error = 0;
@@ -418,7 +436,7 @@ procfs_proc_lock(int pid, struct proc **
if (pid == 0)
tp = &proc0;
- else if ((tp = proc_find(pid)) == NULL)
+ else if ((tp = procfs_proc_find(mp, pid)) == NULL)
error = notfound;
if (tp != NULL && !rw_tryenter(&tp->p_reflock, RW_READER))
error = EBUSY;
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.107 src/sys/miscfs/procfs/procfs_vfsops.c:1.108
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.107 Mon Apr 20 05:22:28 2020
+++ src/sys/miscfs/procfs/procfs_vfsops.c Wed Apr 29 01:56:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.107 2020/04/20 05:22:28 htodd Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.108 2020/04/29 01:56:54 thorpej Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.107 2020/04/20 05:22:28 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.108 2020/04/29 01:56:54 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -322,7 +322,7 @@ procfs_loadvnode(struct mount *mp, struc
struct proc *p;
mutex_enter(proc_lock);
- p = proc_find(pfs->pfs_pid);
+ p = procfs_proc_find(mp, pfs->pfs_pid);
mutex_exit(proc_lock);
if (p == NULL) {
error = ENOENT;
Index: src/sys/miscfs/procfs/procfs_vnops.c
diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.211 src/sys/miscfs/procfs/procfs_vnops.c:1.212
--- src/sys/miscfs/procfs/procfs_vnops.c:1.211 Tue Apr 21 21:42:47 2020
+++ src/sys/miscfs/procfs/procfs_vnops.c Wed Apr 29 01:56:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.211 2020/04/21
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 02:16:57 UTC 2020
Modified Files:
src/external/bsd/openpam/dist/include/security: openpam.h
src/lib/libpam: Makefile.inc
src/lib/libpam/libpam: Makefile
src/lib/libpam/modules: mod.mk
Log Message:
Reverse sense of NO_STATIC_MODULES -> OPENPAM_STATIC_MODULES.
This avoids leaking NO_STATIC_MODULES into the public header, which
has led to considerable confusion and workarounds in pkgrsc.
PR security/39313
PR security/55216
ok christos
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/openpam/dist/include/security/openpam.h
cvs rdiff -u -r1.18 -r1.19 src/lib/libpam/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/lib/libpam/libpam/Makefile
cvs rdiff -u -r1.15 -r1.16 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/include/security/openpam.h
diff -u src/external/bsd/openpam/dist/include/security/openpam.h:1.9 src/external/bsd/openpam/dist/include/security/openpam.h:1.10
--- src/external/bsd/openpam/dist/include/security/openpam.h:1.9 Sat May 6 19:50:09 2017
+++ src/external/bsd/openpam/dist/include/security/openpam.h Wed Apr 29 02:16:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam.h,v 1.9 2017/05/06 19:50:09 christos Exp $ */
+/* $NetBSD: openpam.h,v 1.10 2020/04/29 02:16:56 riastradh Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -359,7 +359,7 @@ struct pam_module {
# define PAM_SOEXT ".so"
#endif
-#if (defined(__GNUC__) || defined(__PCC__)) && !defined(NO_STATIC_MODULES)
+#if (defined(__GNUC__) || defined(__PCC__)) && defined(OPENPAM_STATIC_MODULES)
# include
# ifdef __FreeBSD__
# include
@@ -369,7 +369,6 @@ struct pam_module {
# define SET_DECLARE(a, b) __link_set_decl(a, b)
# define SET_FOREACH(a, b) __link_set_foreach(a, b)
# endif
-# define OPENPAM_STATIC_MODULES
# define PAM_EXTERN static
# define PAM_MODULE_ENTRY(name) \
static char _pam_name[] = name PAM_SOEXT; \
Index: src/lib/libpam/Makefile.inc
diff -u src/lib/libpam/Makefile.inc:1.18 src/lib/libpam/Makefile.inc:1.19
--- src/lib/libpam/Makefile.inc:1.18 Sat May 6 19:52:25 2017
+++ src/lib/libpam/Makefile.inc Wed Apr 29 02:16:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2017/05/06 19:52:25 christos Exp $
+# $NetBSD: Makefile.inc,v 1.19 2020/04/29 02:16:56 riastradh Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -42,10 +42,6 @@ CPPFLAGS+= -DOPENPAM_MODULES_DIRECTORY=\
# No debugging
#CPPFLAGS+= -DDEBUG
-# ...and don't do either of those on the shared library.
-# XXX CSHLIBFLAGS isn't perfect, but it'll do for now.
-CSHLIBFLAGS+= -DNO_STATIC_MODULES
-
# Define the shared library version here. libpam and the modules share a
# version, and we need these variables early for module install rules.
SHLIB_MAJOR= 4
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.23 src/lib/libpam/libpam/Makefile:1.24
--- src/lib/libpam/libpam/Makefile:1.23 Tue Mar 3 00:46:06 2020
+++ src/lib/libpam/libpam/Makefile Wed Apr 29 02:16:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/03/03 00:46:06 christos Exp $
+# $NetBSD: Makefile,v 1.24 2020/04/29 02:16:56 riastradh Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -206,6 +206,8 @@ openpam_static_modules.o: openpam_static
${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
openpam_static.o ${STATIC_MODULE_LIBS}
+CPPFLAGS.openpam_static.c+= -DOPENPAM_STATIC_MODULES
+
CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
COPTS.openpam_dynamic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.15 src/lib/libpam/modules/mod.mk:1.16
--- src/lib/libpam/modules/mod.mk:1.15 Thu Feb 27 02:56:46 2020
+++ src/lib/libpam/modules/mod.mk Wed Apr 29 02:16:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.15 2020/02/27 02:56:46 christos Exp $
+# $NetBSD: mod.mk,v 1.16 2020/04/29 02:16:57 riastradh Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -21,6 +21,7 @@ LIBDPLIBS+= pam ${NETBSDSRCDIR}/li
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
libinstall::
+CPPFLAGS+= -DOPENPAM_STATIC_MODULES
.endif
.include
CVS commit: src/sys/dev/audio
Module Name:src Committed By: isaki Date: Wed Apr 29 03:58:27 UTC 2020 Modified Files: src/sys/dev/audio: audio.c audiodef.h Log Message: Set AUDIO_BLK_MS 40 msec on other old(slow) architectures not only m68k. Thanks tsutsui@ for comment about architecture choice. And move it from audiodef.h to audio.c as suggested by joerg@. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/dev/audio/audio.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/audio/audiodef.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/audio/audio.c diff -u src/sys/dev/audio/audio.c:1.67 src/sys/dev/audio/audio.c:1.68 --- src/sys/dev/audio/audio.c:1.67 Sun Apr 19 03:52:22 2020 +++ src/sys/dev/audio/audio.c Wed Apr 29 03:58:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.67 2020/04/19 03:52:22 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.68 2020/04/29 03:58:27 isaki Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -138,7 +138,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.67 2020/04/19 03:52:22 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.68 2020/04/29 03:58:27 isaki Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -451,6 +451,41 @@ audio_track_bufstat(audio_track_t *track #define SPECIFIED(x) ((x) != ~0) #define SPECIFIED_CH(x) ((x) != (u_char)~0) +/* + * Default hardware blocksize in msec. + * + * We use 10 msec for most platforms. This period is good enough to play + * audio and video synchronizely. + * In contrast, for very old platforms, this is usually too short and too + * severe. Also such platforms usually can not play video confortably, so + * it's not so important to make the blocksize shorter. + * In either case, you can overwrite AUDIO_BLK_MS by your kernel + * configuration file if you wish. + * + * 40 msec was initially choosen for the following reason: + * (1 / 40ms) = 25 = 5^2. Thus, the frequency is factored by 5. + * In this case, the number of frames in a block can be an integer + * even if the frequency is a multiple of 100 (44100, 48000, etc), + * or even if 15625Hz (vs(4)). + */ +#if defined(__hppa__) || \ +defined(__m68k__) || \ +defined(__sh3__) || \ +(defined(__sparc__) && !defined(__sparc64__)) || \ +defined(__vax__) +#define AUDIO_TOO_SLOW_ARCHS 1 +#endif + +#if !defined(AUDIO_BLK_MS) +# if defined(AUDIO_TOO_SLOW_ARCHS) +# define AUDIO_BLK_MS 40 +# else +# define AUDIO_BLK_MS 10 +# endif +#endif + +#undef AUDIO_TOO_SLOW_ARCHS + /* Device timeout in msec */ #define AUDIO_TIMEOUT (3000) Index: src/sys/dev/audio/audiodef.h diff -u src/sys/dev/audio/audiodef.h:1.13 src/sys/dev/audio/audiodef.h:1.14 --- src/sys/dev/audio/audiodef.h:1.13 Sat Mar 28 08:35:36 2020 +++ src/sys/dev/audio/audiodef.h Wed Apr 29 03:58:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: audiodef.h,v 1.13 2020/03/28 08:35:36 isaki Exp $ */ +/* $NetBSD: audiodef.h,v 1.14 2020/04/29 03:58:27 isaki Exp $ */ /* * Copyright (C) 2017 Tetsuya Isaki. All rights reserved. @@ -43,25 +43,6 @@ #define AUMINNOBLK (3) /* - * Hardware blocksize in msec. - * We use 10 msec as default for most platforms. But it's too severe for - * most m68k. - * - * 40 msec was initially choosen for the following reason: - * (1 / 40ms) = 25 = 5^2. Thus, the frequency is factored by 5. - * In this case, the number of frames in a block can be an integer - * even if the frequency is a multiple of 100 (44100, 48000, etc), - * or even if 15625Hz (vs(4)). - */ -#if !defined(AUDIO_BLK_MS) -# if defined(__m68k__) -# define AUDIO_BLK_MS 40 -# else -# define AUDIO_BLK_MS 10 -# endif -#endif - -/* * Whether the playback mixer use single buffer mode. * It reduces the latency one block but needs machine power. * In case of the double buffer (as default), it increases the latency
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 04:30:40 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
Set up more of a fake struct buf, for ldminphys.
Fixes:
arm64# zpool create rpool ld4
[ 198.4376097] panic: Trap: Data Abort (EL1): Translation Fault L1 with read
access for 0178: pc c017acf4: opcode f940bc00: ldr x0,
[x0,#376]
[ 198.4694793] fp c00073026660 ldminphys() at c017acf4
netbsd:ldminphys+0x34
[ 198.4792624] fp c00073026680 vdev_disk_open.part.4() at c13d4c4c
zfs:vdev_disk_open.part.4+0x37c
[ 198.4792624] fp c000730268d0 vdev_open() at c13d2530
zfs:vdev_open+0x68
[ 198.4792624] fp c00073026920 vdev_open_children() at c13d2958
zfs:vdev_open_children+0x40
[ 198.4792624] fp c00073026950 vdev_root_open() at c13dad48
zfs:vdev_root_open+0x30
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.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/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.15 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.16
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.15 Mon Mar 2 16:01:56 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Wed Apr 29 04:30:40 2020
@@ -228,7 +228,10 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
dvd->vd_maxphys = (pdk ? disk_maxphys(pdk) : MACHINE_MAXPHYS);
*/
{
- struct buf buf = { .b_bcount = MAXPHYS };
+ struct buf buf = {
+ .b_dev = vp->v_rdev,
+ .b_bcount = MAXPHYS,
+ };
if (pdk && pdk->dk_driver && pdk->dk_driver->d_minphys)
(*pdk->dk_driver->d_minphys)(&buf);
dvd->vd_maxphys = buf.b_bcount;
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 05:54:37 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/sys: cred.h
src/sys/sys: kauth.h
Log Message:
Fix crgetgroups shim.
- Don't use a static buffer for the result.
- kauth_cred_getgroups refuses to return more than the actual number
of groups, so passing NGROUPS_MAX generally doesn't work.
To avoid patching zfs, just expose struct kauth_cred::cr_groups
directly, with __KAUTH_PRIVATE. Unclear why the official API only
exposes it via memcpy or copyout anyway.
This makes unprivileged zfs operations work, by anyone with access to
/dev/zfs (which is conventionally mode 777, and which we should maybe
set it to by default; zfs has its own ACL system, zfs allow).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/cred.h
cvs rdiff -u -r1.83 -r1.84 src/sys/sys/kauth.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/sys/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.6 src/external/cddl/osnet/sys/sys/cred.h:1.7
--- src/external/cddl/osnet/sys/sys/cred.h:1.6 Wed Feb 6 17:56:57 2019
+++ src/external/cddl/osnet/sys/sys/cred.h Wed Apr 29 05:54:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.6 2019/02/06 17:56:57 christos Exp $ */
+/* $NetBSD: cred.h,v 1.7 2020/04/29 05:54:37 riastradh Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek
@@ -31,6 +31,11 @@
#ifndef _OPENSOLARIS_SYS_CRED_H_
#define _OPENSOLARIS_SYS_CRED_H_
+#ifdef _KERNEL
+/* Needed for access to cr_groups. */
+#define __KAUTH_PRIVATE
+#endif
+
#include
#include
@@ -57,22 +62,11 @@ extern kauth_cred_t cred0;
kauth_cred_setegid(cr, g), \
kauth_cred_setsvuid(cr, u), \
kauth_cred_setsvgid(cr, g), 0)
+#define crgetgroups(cr) ((cr)->cr_groups)
#define crsetgroups(cr, gc, ga) \
kauth_cred_setgroups(cr, ga, gc, 0, UIO_SYSSPACE)
#define crgetsid(cr, i) (NULL)
-static __inline gid_t *
-crgetgroups(cred_t *cr)
-{
- static gid_t gids[NGROUPS_MAX];
-
- memset(gids, 0, sizeof(gids));
- if (kauth_cred_getgroups(cr, gids, NGROUPS_MAX, UIO_SYSSPACE) != 0)
- return NULL;
-
- return gids;
-}
-
static __inline int
groupmember(gid_t gid, cred_t *cr)
{
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.83 src/sys/sys/kauth.h:1.84
--- src/sys/sys/kauth.h:1.83 Fri Feb 14 04:36:33 2020
+++ src/sys/sys/kauth.h Wed Apr 29 05:54:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kauth.h,v 1.83 2020/02/14 04:36:33 riastradh Exp $ */
+/* $NetBSD: kauth.h,v 1.84 2020/04/29 05:54:37 riastradh Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat
@@ -57,7 +57,11 @@ typedef int (*kauth_scope_callback_t)(ka
typedef struct kauth_key *kauth_key_t;
#ifdef __KAUTH_PRIVATE /* For the debugger */
-/*
+
+#include
+#include
+
+/*
* Credentials.
*
* A subset of this structure is used in kvm(3) (src/lib/libkvm/kvm_proc.c)
@@ -86,6 +90,7 @@ struct kauth_cred {
gid_t cr_groups[NGROUPS]; /* group memberships */
specificdata_reference cr_sd; /* specific data */
};
+
#endif
/*
CVS commit: src/distrib/arc/ramdisk
Module Name:src
Committed By: mrg
Date: Wed Apr 29 06:53:46 UTC 2020
Modified Files:
src/distrib/arc/ramdisk: Makefile
Log Message:
bump ramdisk size to 3200k for gcc 8. yay!
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/arc/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/arc/ramdisk/Makefile
diff -u src/distrib/arc/ramdisk/Makefile:1.27 src/distrib/arc/ramdisk/Makefile:1.28
--- src/distrib/arc/ramdisk/Makefile:1.27 Sun Dec 29 18:26:16 2019
+++ src/distrib/arc/ramdisk/Makefile Wed Apr 29 06:53:46 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2019/12/29 18:26:16 christos Exp $
+# $NetBSD: Makefile,v 1.28 2020/04/29 06:53:46 mrg Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 3060k
+IMAGESIZE= 3200k
MAKEFS_FLAGS+= -f 15
WARNS= 1
