CVS commit: src/sbin/umount
Module Name:src
Committed By: christos
Date: Thu Apr 23 04:21:13 UTC 2020
Modified Files:
src/sbin/umount: Makefile umount.c
Log Message:
make umount NAME= work
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/umount/Makefile
cvs rdiff -u -r1.52 -r1.53 src/sbin/umount/umount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/umount/Makefile
diff -u src/sbin/umount/Makefile:1.19 src/sbin/umount/Makefile:1.20
--- src/sbin/umount/Makefile:1.19 Sun Oct 13 03:28:13 2019
+++ src/sbin/umount/Makefile Thu Apr 23 00:21:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:13 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2020/04/23 04:21:13 christos Exp $
# @(#)Makefile 8.4 (Berkeley) 6/22/95
.include
@@ -15,6 +15,8 @@ CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
SRCS+= vfslist.c
.endif
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
COPTS.umount.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
Index: src/sbin/umount/umount.c
diff -u src/sbin/umount/umount.c:1.52 src/sbin/umount/umount.c:1.53
--- src/sbin/umount/umount.c:1.52 Sun Jun 26 00:01:30 2016
+++ src/sbin/umount/umount.c Thu Apr 23 00:21:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umount.c,v 1.52 2016/06/26 04:01:30 dholland Exp $ */
+/* $NetBSD: umount.c,v 1.53 2020/04/23 04:21:13 christos Exp $ */
/*-
* Copyright (c) 1980, 1989, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95";
#else
-__RCSID("$NetBSD: umount.c,v 1.52 2016/06/26 04:01:30 dholland Exp $");
+__RCSID("$NetBSD: umount.c,v 1.53 2020/04/23 04:21:13 christos Exp $");
#endif
#endif /* not lint */
@@ -65,6 +65,7 @@ __RCSID("$NetBSD: umount.c,v 1.52 2016/0
#include
#include
#include
+#include
typedef enum { MNTANY, MNTON, MNTFROM } mntwhat;
@@ -90,6 +91,7 @@ int
main(int argc, char *argv[])
{
int ch, errs, all = 0, raw = 0;
+ char mntfromname[MAXPATHLEN];
#ifndef SMALL
int mnts;
struct statvfs *mntbuf;
@@ -168,9 +170,13 @@ main(int argc, char *argv[])
}
} else
#endif /* !SMALL */
- for (errs = 0; *argv != NULL; ++argv)
- if (umountfs(*argv, typelist, raw) != 0)
+ for (errs = 0; *argv != NULL; ++argv) {
+ if (getfsspecname(mntfromname, sizeof(mntfromname),
+ *argv) == NULL)
+err(EXIT_FAILURE, "%s", mntfromname);
+ if (umountfs(mntfromname, typelist, raw) != 0)
errs = 1;
+ }
return errs;
}
@@ -339,6 +345,7 @@ getmntname(const char *name, mntwhat wha
{
static struct statvfs *mntbuf;
static int mntsize;
+ static char mntfromname[MAXPATHLEN];
int i;
if (mntbuf == NULL &&
@@ -355,7 +362,10 @@ getmntname(const char *name, mntwhat wha
if ((what == MNTFROM) && !strcmp(mntbuf[i].f_mntonname, name)) {
if (type)
*type = mntbuf[i].f_fstypename;
- return (mntbuf[i].f_mntfromname);
+ if (getfsspecname(mntfromname, sizeof(mntfromname),
+ mntbuf[i].f_mntfromname) == NULL)
+err(EXIT_FAILURE, "%s", mntfromname);
+ return mntfromname;
}
}
return (NULL);
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Apr 23 04:17:37 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Remove duplicated entry. To generate a diff of this commit: cvs rdiff -u -r1.1411 -r1.1412 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1411 src/sys/dev/pci/pcidevs:1.1412 --- src/sys/dev/pci/pcidevs:1.1411 Wed Apr 22 22:54:43 2020 +++ src/sys/dev/pci/pcidevs Thu Apr 23 04:17:37 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp $ +$NetBSD: pcidevs,v 1.1412 2020/04/23 04:17:37 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1293,7 +1293,6 @@ product AQUANTIA AQC100 0x00b1 AQC100 1 product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter -product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Apr 23 04:18:07 UTC 2020
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1398 -r1.1399 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1397 -r1.1398 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1398 src/sys/dev/pci/pcidevs.h:1.1399
--- src/sys/dev/pci/pcidevs.h:1.1398 Wed Apr 22 22:56:12 2020
+++ src/sys/dev/pci/pcidevs.h Thu Apr 23 04:18:06 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1398 2020/04/22 22:56:12 christos Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1399 2020/04/23 04:18:06 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp
+ * NetBSD: pcidevs,v 1.1412 2020/04/23 04:17:37 msaitoh Exp
*/
/*
@@ -1300,7 +1300,6 @@
#define PCI_PRODUCT_AQUANTIA_AQC107 0x07b1 /* AQC107 10 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC108 0x08b1 /* AQC108 5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC109 0x09b1 /* AQC109 2.5 Gigabit Network Adapter */
-#define PCI_PRODUCT_AQUANTIA_AQC100 0x00b1 /* AQC100 10 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC111 0x11b1 /* AQC111 5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC112 0x12b1 /* AQC112 2.5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC100S 0x80b1 /* AQC100S 10 Gigabit Network Adapter */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1397 src/sys/dev/pci/pcidevs_data.h:1.1398
--- src/sys/dev/pci/pcidevs_data.h:1.1397 Wed Apr 22 22:56:12 2020
+++ src/sys/dev/pci/pcidevs_data.h Thu Apr 23 04:18:06 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1397 2020/04/22 22:56:12 christos Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1398 2020/04/23 04:18:06 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp
+ * NetBSD: pcidevs,v 1.1412 2020/04/23 04:17:37 msaitoh Exp
*/
/*
@@ -1754,8 +1754,6 @@ static const uint16_t pci_products[] = {
9051, 8083, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC109,
9058, 9065, 5669, 3888, 5869, 0,
- PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC100,
- 9034, 9041, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC111,
9069, 8083, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC112,
@@ -14913,7 +14911,7 @@ static const char pci_words[] = { "."
"Pathlight\0" /* 1 refs @ 3860 */
"VideoTron\0" /* 1 refs @ 3870 */
"Pyramid\0" /* 1 refs @ 3880 */
- "Network\0" /* 71 refs @ 3888 */
+ "Network\0" /* 70 refs @ 3888 */
"Pinnacle\0" /* 1 refs @ 3896 */
"Microcircuts\0" /* 1 refs @ 3905 */
"Lucent\0" /* 1 refs @ 3918 */
@@ -15151,7 +15149,7 @@ static const char pci_words[] = { "."
"VENDOR\0" /* 1 refs @ 5653 */
"ID\0" /* 1 refs @ 5660 */
"3c985\0" /* 1 refs @ 5663 */
- "Gigabit\0" /* 143 refs @ 5669 */
+ "Gigabit\0" /* 142 refs @ 5669 */
"Ethernet\0" /* 530 refs @ 5677 */
"3c996\0" /* 1 refs @ 5686 */
"10/100/1000\0" /* 49 refs @ 5692 */
@@ -15176,7 +15174,7 @@ static const char pci_words[] = { "."
"3c595-T4\0" /* 1 refs @ 5838 */
"3c595-MII\0" /* 1 refs @ 5847 */
"3CRWE154G72\0" /* 1 refs @ 5857 */
- "Adapter\0" /* 94 refs @ 5869 */
+ "Adapter\0" /* 93 refs @ 5869 */
"3c556B\0" /* 1 refs @ 5877 */
"3CCFEM656\0" /* 2 refs @ 5884 */
"56k\0" /* 5 refs @ 5894 */
@@ -15606,8 +15604,8 @@ static const char pci_words[] = { "."
"U3\0" /* 6 refs @ 9015 */
"Shasta\0" /* 8 refs @ 9018 */
"FireWire\0" /* 2 refs @ 9025 */
- "AQC100\0" /* 2 refs @ 9034 */
- "10\0" /* 42 refs @ 9041 */
+ "AQC100\0" /* 1 refs @ 9034 */
+ "10\0" /* 41 refs @ 9041 */
"AQC107\0" /* 1 refs @ 9044 */
"AQC108\0" /* 1 refs @ 9051 */
"AQC109\0" /* 1 refs @ 9058 */
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Thu Apr 23 03:15:47 UTC 2020 Modified Files: src/sys/kern: kern_crashme.c Log Message: Fix outdated comment. We've enabled crashme for non-DEBUG kernels. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_crashme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_crashme.c diff -u src/sys/kern/kern_crashme.c:1.2 src/sys/kern/kern_crashme.c:1.3 --- src/sys/kern/kern_crashme.c:1.2 Sun Jan 13 00:11:29 2019 +++ src/sys/kern/kern_crashme.c Thu Apr 23 03:15:47 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_crashme.c,v 1.2 2019/01/13 00:11:29 tnn Exp $ */ +/* $NetBSD: kern_crashme.c,v 1.3 2020/04/23 03:15:47 rin Exp $ */ /* * Copyright (c) 2018, 2019 Matthew R. Green @@ -29,8 +29,8 @@ */ /* - * kern_crashme.c: special debugging routines only enabled in DEBUG - * enabled kernels, designed for debugging kernel crashes. + * kern_crashme.c: special debugging routines, designed for debugging + * kernel crashes. * * supports crashme sysctl nodes, to test various ways the system can * panic or crash. you can add and remove nodes.
CVS commit: src/sys/lib/libkern/arch/m68k
Module Name:src
Committed By: rin
Date: Thu Apr 23 03:12:49 UTC 2020
Modified Files:
src/sys/lib/libkern/arch/m68k: divsi3.S modsi3.S udivsi3.S umodsi3.S
Log Message:
Remove "#ifndef __mc68010__ #error" I added when these {,u}divsi3.S and
{,u}modsi3.S were moved here (It was better to split the commit, sorry);
bootloader for sun3 still depends on them.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/arch/m68k/divsi3.S \
src/sys/lib/libkern/arch/m68k/modsi3.S \
src/sys/lib/libkern/arch/m68k/umodsi3.S
cvs rdiff -u -r1.5 -r1.6 src/sys/lib/libkern/arch/m68k/udivsi3.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arch/m68k/divsi3.S
diff -u src/sys/lib/libkern/arch/m68k/divsi3.S:1.3 src/sys/lib/libkern/arch/m68k/divsi3.S:1.4
--- src/sys/lib/libkern/arch/m68k/divsi3.S:1.3 Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/divsi3.S Thu Apr 23 03:12:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: divsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $ */
+/* $NetBSD: divsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
#if 0
RCSID("from: @(#)divsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: divsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $")
+ RCSID("$NetBSD: divsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* int / int */
#ifndef __mc68010__
-#error
+/* XXX sun3 need this for bootloader */
ENTRY(__divsi3)
movel 4(%sp),%d0
divsl 8(%sp),%d0
Index: src/sys/lib/libkern/arch/m68k/modsi3.S
diff -u src/sys/lib/libkern/arch/m68k/modsi3.S:1.3 src/sys/lib/libkern/arch/m68k/modsi3.S:1.4
--- src/sys/lib/libkern/arch/m68k/modsi3.S:1.3 Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/modsi3.S Thu Apr 23 03:12:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: modsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $ */
+/* $NetBSD: modsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
#if 0
RCSID("from: @(#)modsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: modsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $")
+ RCSID("$NetBSD: modsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* int % int */
#ifndef __mc68010__
-#error
+/* XXX sun3 need this for bootloader */
ENTRY(__modsi3)
movel 4(%sp),%d1
#ifdef __mcoldfire__
Index: src/sys/lib/libkern/arch/m68k/umodsi3.S
diff -u src/sys/lib/libkern/arch/m68k/umodsi3.S:1.3 src/sys/lib/libkern/arch/m68k/umodsi3.S:1.4
--- src/sys/lib/libkern/arch/m68k/umodsi3.S:1.3 Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/umodsi3.S Thu Apr 23 03:12:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umodsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $ */
+/* $NetBSD: umodsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
#if 0
RCSID("from: @(#)umodsi3.s 5.1 (Berkeley) 6/7/90")(
#else
- RCSID("$NetBSD: umodsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $")
+ RCSID("$NetBSD: umodsi3.S,v 1.4 2020/04/23 03:12:49 rin Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* unsigned % unsigned */
#ifndef __mc68010__
-#error
+/* XXX sun3 need this for bootloader */
ENTRY(__umodsi3)
movel 4(%sp),%d1
#ifdef __mcoldfire__
Index: src/sys/lib/libkern/arch/m68k/udivsi3.S
diff -u src/sys/lib/libkern/arch/m68k/udivsi3.S:1.5 src/sys/lib/libkern/arch/m68k/udivsi3.S:1.6
--- src/sys/lib/libkern/arch/m68k/udivsi3.S:1.5 Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/udivsi3.S Thu Apr 23 03:12:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: udivsi3.S,v 1.5 2020/04/22 11:58:26 rin Exp $ */
+/* $NetBSD: udivsi3.S,v 1.6 2020/04/23 03:12:49 rin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -39,13 +39,13 @@
#if 0
RCSID("from: @(#)udivsi3.s 5.1 (Berkeley) 6/7/90")
#else
- RCSID("$NetBSD: udivsi3.S,v 1.5 2020/04/22 11:58:26 rin Exp $")
+ RCSID("$NetBSD: udivsi3.S,v 1.6 2020/04/23 03:12:49 rin Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
/* unsigned / unsigned */
#ifndef __mc68010__
-#error
+/* XXX sun3 need this for bootloader */
ENTRY(__udivsi3)
movel 4(%sp),%d0
divul 8(%sp),%d0
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: rin
Date: Thu Apr 23 03:09:18 UTC 2020
Modified Files:
src/sys/lib/libkern: Makefile.compiler-rt
Log Message:
For m68k, do not compile in {,u}divsi3 and {,u}modsi3 since codes
generated by gcc do not depend on them.
We should not have unused functions in libkern for MODULAR.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libkern/Makefile.compiler-rt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.compiler-rt
diff -u src/sys/lib/libkern/Makefile.compiler-rt:1.10 src/sys/lib/libkern/Makefile.compiler-rt:1.11
--- src/sys/lib/libkern/Makefile.compiler-rt:1.10 Sun Sep 29 23:44:59 2019
+++ src/sys/lib/libkern/Makefile.compiler-rt Thu Apr 23 03:09:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.compiler-rt,v 1.10 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile.compiler-rt,v 1.11 2020/04/23 03:09:18 rin Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -65,9 +65,14 @@ GENERIC_SRCS+= \
.if ${MACHINE_CPU} != "aarch64" && ${MACHINE} != "alpha"
GENERIC_SRCS+= \
divmodsi4.c \
+ udivmodsi4.c
+.endif
+
+.if ${MACHINE_CPU} != "aarch64" && ${MACHINE} != "alpha" && \
+${MACHINE_ARCH} != "m68k"
+GENERIC_SRCS+= \
divsi3.c \
modsi3.c \
- udivmodsi4.c \
udivsi3.c \
umodsi3.c
.endif
CVS commit: src/usr.bin/tip
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:35:14 UTC 2020
Modified Files:
src/usr.bin/tip: tip.c tip.h
Log Message:
Avoid using common symbol definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/tip/tip.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/tip/tip.h
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/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.62 src/usr.bin/tip/tip.c:1.63
--- src/usr.bin/tip/tip.c:1.62 Thu Feb 28 17:41:27 2019
+++ src/usr.bin/tip/tip.c Thu Apr 23 00:35:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.62 2019/02/28 17:41:27 gson Exp $ */
+/* $NetBSD: tip.c,v 1.63 2020/04/23 00:35:14 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tip.c,v 1.62 2019/02/28 17:41:27 gson Exp $");
+__RCSID("$NetBSD: tip.c,v 1.63 2020/04/23 00:35:14 joerg Exp $");
#endif /* not lint */
/*
@@ -54,6 +54,70 @@ __RCSID("$NetBSD: tip.c,v 1.62 2019/02/2
#include "tip.h"
#include "pathnames.h"
+struct termios term;
+struct termios defterm;
+struct termios defchars;
+
+FILE *fscript;
+
+int attndes[2];
+int fildes[2];
+int repdes[2];
+int FD;
+#ifndef __lint__ /* not used by hayes.c, but used by some other dialers */
+int AC;
+#endif /*__lint__*/
+int sfd;
+int pid;
+uid_t uid, euid;
+gid_t gid, egid;
+int stop;
+int quit;
+int stoprompt;
+int timedout;
+int cumode;
+int bits8;
+#define STRIP_PAR (bits8 ? 0377 : 0177)
+
+char fname[80];
+char copyname[80];
+char ccc;
+
+int odisc;
+int vflag;
+
+char *DV;
+char *EL;
+char *CM;
+char *IE;
+char *OE;
+char *CU;
+char *AT;
+char *PN;
+char *DI;
+char *PA;
+
+char *PH;
+char *RM;
+char *HO;
+
+long BR;
+long FS;
+
+long DU;
+long HW;
+char *ES;
+char *EX;
+char *FO;
+char *RC;
+char *RE;
+char *PR;
+long DL;
+long CL;
+long ET;
+long HD;
+char DC;
+
__dead static void tipusage(void);
int escape(void);
Index: src/usr.bin/tip/tip.h
diff -u src/usr.bin/tip/tip.h:1.33 src/usr.bin/tip/tip.h:1.34
--- src/usr.bin/tip/tip.h:1.33 Mon Oct 21 14:47:46 2013
+++ src/usr.bin/tip/tip.h Thu Apr 23 00:35:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.h,v 1.33 2013/10/21 14:47:46 christos Exp $ */
+/* $NetBSD: tip.h,v 1.34 2020/04/23 00:35:14 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -59,37 +59,37 @@
/*
* Remote host attributes
*/
-char *DV; /* UNIX device(s) to open */
-char *EL; /* chars marking an EOL */
-char *CM; /* initial connection message */
-char *IE; /* EOT to expect on input */
-char *OE; /* EOT to send to complete FT */
-char *CU; /* call unit if making a phone call */
-char *AT; /* acu type */
-char *PN; /* phone number(s) */
-char *DI; /* disconnect string */
-char *PA; /* parity to be generated */
-
-char *PH; /* phone number file */
-char *RM; /* remote file name */
-char *HO; /* host name */
-
-long BR; /* line speed for conversation */
-long FS; /* frame size for transfers */
-
-long DU; /* this host is dialed up */
-long HW; /* this device is hardwired, see hunt.c */
-char *ES; /* escape character */
-char *EX; /* exceptions */
-char *FO; /* force (literal next) char*/
-char *RC; /* raise character */
-char *RE; /* script record file */
-char *PR; /* remote prompt */
-long DL; /* line delay for file transfers to remote */
-long CL; /* char delay for file transfers to remote */
-long ET; /* echocheck timeout */
-long HD; /* this host is half duplex - do local echo */
-char DC; /* this host is directly connected. */
+extern char *DV; /* UNIX device(s) to open */
+extern char *EL; /* chars marking an EOL */
+extern char *CM; /* initial connection message */
+extern char *IE; /* EOT to expect on input */
+extern char *OE; /* EOT to send to complete FT */
+extern char *CU; /* call unit if making a phone call */
+extern char *AT; /* acu type */
+extern char *PN; /* phone number(s) */
+extern char *DI; /* disconnect string */
+extern char *PA; /* parity to be generated */
+
+extern char *PH; /* phone number file */
+extern char *RM; /* remote file name */
+extern char *HO; /* host name */
+
+extern long BR; /* line speed for conversation */
+extern long FS; /* frame size for transfers */
+
+extern long DU; /* this host is dialed up */
+extern long HW; /* this device is hardwired, see hunt.c */
+extern char *ES; /* escape character */
+extern char *EX; /* exceptions */
+extern char *FO; /* force (literal next) char*/
+extern char *RC; /* raise character */
+extern char *RE; /* script record file */
+extern char *PR; /* remote prompt */
+extern long DL; /* line delay for file transfers to remote */
+extern long CL; /* char delay for file transfers to remote */
+extern long ET; /* echocheck timeout */
+extern long HD; /* this
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: joerg Date: Thu Apr 23 00:34:29 UTC 2020 Modified Files: src/sys/rump/librump/rumpkern: rump.c Log Message: rump doesn't own pnbuf_cache, externalize it To generate a diff of this commit: cvs rdiff -u -r1.344 -r1.345 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.344 src/sys/rump/librump/rumpkern/rump.c:1.345 --- src/sys/rump/librump/rumpkern/rump.c:1.344 Mon Mar 23 14:49:50 2020 +++ src/sys/rump/librump/rumpkern/rump.c Thu Apr 23 00:34:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.344 2020/03/23 14:49:50 pgoyette Exp $ */ +/* $NetBSD: rump.c,v 1.345 2020/04/23 00:34:29 joerg Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.344 2020/03/23 14:49:50 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.345 2020/04/23 00:34:29 joerg Exp $"); #include #define ELFSIZE ARCH_ELFSIZE @@ -114,7 +114,7 @@ static char rump_msgbuf[16*1024] __alig bool rump_ttycomponent = false; -pool_cache_t pnbuf_cache; +extern pool_cache_t pnbuf_cache; static int rump_inited;
CVS commit: src/tests
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:31:52 UTC 2020
Modified Files:
src/tests/fs/nfs/nfsservice: rumpnfsd.c
src/tests/net/config: netconfig.c
Log Message:
Replace noatf global with conditional compilation
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/nfs/nfsservice/rumpnfsd.c
cvs rdiff -u -r1.9 -r1.10 src/tests/net/config/netconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/nfsservice/rumpnfsd.c
diff -u src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.9 src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.10
--- src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.9 Sun Nov 8 02:45:16 2015
+++ src/tests/fs/nfs/nfsservice/rumpnfsd.c Thu Apr 23 00:31:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpnfsd.c,v 1.9 2015/11/08 02:45:16 christos Exp $ */
+/* $NetBSD: rumpnfsd.c,v 1.10 2020/04/23 00:31:51 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -45,6 +45,7 @@ int nfsd_main(int, char **);
sem_t gensem;
+#define RUMPNFSD_NOATF
#include "../../../net/config/netconfig.c"
#include "../../common/h_fsmacros.h"
#include "svc_fdset.h"
@@ -65,9 +66,6 @@ main(int argc, char *argv[])
pthread_t t;
int rv;
- /* for netcfg */
- noatf = 1;
-
/* use defaults? */
if (argc == 1) {
ethername = "etherbus";
Index: src/tests/net/config/netconfig.c
diff -u src/tests/net/config/netconfig.c:1.9 src/tests/net/config/netconfig.c:1.10
--- src/tests/net/config/netconfig.c:1.9 Fri Jan 13 21:30:42 2017
+++ src/tests/net/config/netconfig.c Thu Apr 23 00:31:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netconfig.c,v 1.9 2017/01/13 21:30:42 christos Exp $ */
+/* $NetBSD: netconfig.c,v 1.10 2020/04/23 00:31:51 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: netconfig.c,v 1.9 2017/01/13 21:30:42 christos Exp $");
+__RCSID("$NetBSD: netconfig.c,v 1.10 2020/04/23 00:31:51 joerg Exp $");
#endif /* not lint */
#include
@@ -55,7 +55,6 @@ __RCSID("$NetBSD: netconfig.c,v 1.9 2017
#include "h_macros.h"
-int noatf;
static void __unused
netcfg_rump_makeshmif(const char *busname, char *ifname)
@@ -63,10 +62,11 @@ netcfg_rump_makeshmif(const char *busnam
int rv, ifnum;
if ((rv = rump_pub_shmif_create(busname, )) != 0) {
- if (noatf)
- err(1, "makeshmif: rump_pub_shmif_create %d", rv);
- else
- atf_tc_fail("makeshmif: rump_pub_shmif_create %d", rv);
+#ifdef RUMPNFSD_NOATF
+ err(1, "makeshmif: rump_pub_shmif_create %d", rv);
+#else
+ atf_tc_fail("makeshmif: rump_pub_shmif_create %d", rv);
+#endif
}
sprintf(ifname, "shmif%d", ifnum);
}
@@ -81,10 +81,11 @@ netcfg_rump_if(const char *ifname, const
s = -1;
if ((s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
- if (noatf)
- err(1, "if config socket");
- else
- atf_tc_fail_errno("if config socket");
+#ifdef RUMPNFSD_NOATF
+ err(1, "if config socket");
+#else
+ atf_tc_fail_errno("if config socket");
+#endif
}
inaddr = inet_addr(addr);
@@ -112,10 +113,11 @@ netcfg_rump_if(const char *ifname, const
rv = rump_sys_ioctl(s, SIOCAIFADDR, );
if (rv == -1) {
- if (noatf)
- err(1, "SIOCAIFADDR");
- else
- atf_tc_fail_errno("SIOCAIFADDR");
+#ifdef RUMPNFSD_NOATF
+ err(1, "SIOCAIFADDR");
+#else
+ atf_tc_fail_errno("SIOCAIFADDR");
+#endif
}
rump_sys_close(s);
}
@@ -135,10 +137,11 @@ netcfg_rump_route(const char *dst, const
s = rump_sys_socket(PF_ROUTE, SOCK_RAW, 0);
if (s == -1) {
- if (noatf)
- err(1, "routing socket");
- else
- atf_tc_fail_errno("routing socket");
+#ifdef RUMPNFSD_NOATF
+ err(1, "routing socket");
+#else
+ atf_tc_fail_errno("routing socket");
+#endif
}
memset(_rtmsg, 0, sizeof(m_rtmsg));
@@ -177,10 +180,11 @@ netcfg_rump_route(const char *dst, const
rv = rump_sys_write(s, _rtmsg, len);
if (rv != (int)len) {
- if (noatf)
- err(1, "write routing message");
- else
- atf_tc_fail_errno("write routing message");
+#ifdef RUMPNFSD_NOATF
+ err(1, "write routing message");
+#else
+ atf_tc_fail_errno("write routing message");
+#endif
}
rump_sys_close(s);
}
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:30:09 UTC 2020
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
Log Message:
saved_output is owned by director.c
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/lib/libcurses/director/testlang_parse.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.16 src/tests/lib/libcurses/director/testlang_parse.y:1.17
--- src/tests/lib/libcurses/director/testlang_parse.y:1.16 Thu Sep 19 11:31:57 2019
+++ src/tests/lib/libcurses/director/testlang_parse.y Thu Apr 23 00:30:08 2020
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.16 2019/09/19 11:31:57 blymn Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.17 2020/04/23 00:30:08 joerg Exp $ */
/*-
* Copyright 2009 Brett Lymn
@@ -152,7 +152,7 @@ static const char *input_functions[] = {
static const unsigned ninput_functions =
sizeof(input_functions) / sizeof(char *);
-saved_data_t saved_output;
+extern saved_data_t saved_output;
%}
CVS commit: src/usr.sbin/pf/pfs
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:29:00 UTC 2020
Modified Files:
src/usr.sbin/pf/pfs: parse.y parser.h
Log Message:
lineno, states and allocated should be owned by the parser
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/pf/pfs/parse.y \
src/usr.sbin/pf/pfs/parser.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/pf/pfs/parse.y
diff -u src/usr.sbin/pf/pfs/parse.y:1.2 src/usr.sbin/pf/pfs/parse.y:1.3
--- src/usr.sbin/pf/pfs/parse.y:1.2 Sat Oct 19 17:16:38 2013
+++ src/usr.sbin/pf/pfs/parse.y Thu Apr 23 00:29:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.2 2013/10/19 17:16:38 christos Exp $ */
+/* $NetBSD: parse.y,v 1.3 2020/04/23 00:29:00 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: parse.y,v 1.2 2013/10/19 17:16:38 christos Exp $");
+__RCSID("$NetBSD: parse.y,v 1.3 2020/04/23 00:29:00 joerg Exp $");
#endif
#include
@@ -50,6 +50,11 @@ __RCSID("$NetBSD: parse.y,v 1.2 2013/10/
#include "parser.h"
+int lineno;
+
+struct pfioc_states* states;
+size_t allocated;
+
// XXX it is really correct ?
extern const char * const tcpstates[];
Index: src/usr.sbin/pf/pfs/parser.h
diff -u src/usr.sbin/pf/pfs/parser.h:1.2 src/usr.sbin/pf/pfs/parser.h:1.3
--- src/usr.sbin/pf/pfs/parser.h:1.2 Wed Aug 31 13:32:39 2011
+++ src/usr.sbin/pf/pfs/parser.h Thu Apr 23 00:29:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.h,v 1.2 2011/08/31 13:32:39 joerg Exp $ */
+/* $NetBSD: parser.h,v 1.3 2020/04/23 00:29:00 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -34,9 +34,9 @@ __dead void yyfatal(const char*);
int parse(FILE*, struct pfioc_states*);
int yyparse(void);
-int lineno;
+extern int lineno;
-struct pfioc_states* states;
-size_t allocated;
+extern struct pfioc_states* states;
+extern size_t allocated;
#endif /* _PARSER_H_*/
CVS commit: src/usr.sbin/npf/npftest/libnpftest
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:27:45 UTC 2020
Modified Files:
src/usr.sbin/npf/npftest/libnpftest: npf_test.h
Log Message:
npftest_mbufops and npftest_ifops are owned by npf_mbuf_subr.c
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/npf/npftest/libnpftest/npf_test.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test.h
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.19 src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.20
--- src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.19 Tue Jul 23 00:52:02 2019
+++ src/usr.sbin/npf/npftest/libnpftest/npf_test.h Thu Apr 23 00:27:45 2020
@@ -84,8 +84,8 @@ struct mbuf {
#define CHECK_TRUE(x) \
if (!(x)) { printf("FAIL: %s line %d\n", __func__, __LINE__); return 0; }
-const npf_mbufops_t npftest_mbufops;
-const npf_ifops_t npftest_ifops;
+extern const npf_mbufops_t npftest_mbufops;
+extern const npf_ifops_t npftest_ifops;
struct mbuf * npfkern_m_get(int, int);
size_t npfkern_m_length(const struct mbuf *);
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:24:50 UTC 2020
Modified Files:
src/usr.bin/netstat: main.c netstat.h
Log Message:
Avoid common symbol definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/netstat/netstat.h
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/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.99 src/usr.bin/netstat/main.c:1.100
--- src/usr.bin/netstat/main.c:1.99 Thu Jul 14 20:13:10 2016
+++ src/usr.bin/netstat/main.c Thu Apr 23 00:24:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.99 2016/07/14 20:13:10 christos Exp $ */
+/* $NetBSD: main.c,v 1.100 2020/04/23 00:24:50 joerg Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-__RCSID("$NetBSD: main.c,v 1.99 2016/07/14 20:13:10 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.100 2020/04/23 00:24:50 joerg Exp $");
#endif
#endif /* not lint */
@@ -67,6 +67,38 @@ __RCSID("$NetBSD: main.c,v 1.99 2016/07/
#include "rtutil.h"
#include "prog_ops.h"
+int Aflag;
+int aflag;
+int Bflag;
+int bflag;
+int dflag;
+#ifndef SMALL
+int gflag;
+#endif
+int hflag;
+int iflag;
+int Lflag;
+int lflag;
+int mflag;
+int numeric_addr;
+int numeric_port;
+int nflag;
+int Pflag;
+int pflag;
+int qflag;
+int rflag;
+int sflag;
+int tagflag;
+int tflag;
+int Vflag;
+int vflag;
+
+char *interface;
+
+int af;
+int use_sysctl;
+int force_sysctl;
+
struct nlist nl[] = {
#define N_MBSTAT 0
{ "_mbstat", 0, 0, 0, 0 },
Index: src/usr.bin/netstat/netstat.h
diff -u src/usr.bin/netstat/netstat.h:1.51 src/usr.bin/netstat/netstat.h:1.52
--- src/usr.bin/netstat/netstat.h:1.51 Thu Nov 6 21:30:09 2014
+++ src/usr.bin/netstat/netstat.h Thu Apr 23 00:24:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.51 2014/11/06 21:30:09 christos Exp $ */
+/* $NetBSD: netstat.h,v 1.52 2020/04/23 00:24:50 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -34,37 +34,37 @@
#include
#include
-int Aflag; /* show addresses of protocol control block */
-int aflag; /* show all sockets (including servers) */
-int Bflag; /* show Berkeley Packet Filter information */
-int bflag; /* show i/f byte stats */
-int dflag; /* show i/f dropped packets */
+extern int Aflag; /* show addresses of protocol control block */
+extern int aflag; /* show all sockets (including servers) */
+extern int Bflag; /* show Berkeley Packet Filter information */
+extern int bflag; /* show i/f byte stats */
+extern int dflag; /* show i/f dropped packets */
#ifndef SMALL
-int gflag; /* show group (multicast) routing or stats */
+extern int gflag; /* show group (multicast) routing or stats */
#endif
-int hflag; /* humanize byte counts */
-int iflag; /* show interfaces */
-int Lflag; /* don't show LLINFO entries */
-int lflag; /* show routing table with use and ref */
-int mflag; /* show memory stats */
-int numeric_addr; /* show addresses numerically */
-int numeric_port; /* show ports numerically */
-int nflag; /* same as above, for show.c compat */
-int Pflag; /* dump a PCB */
-int pflag; /* show given protocol */
-int qflag; /* show softintrq */
-int rflag; /* show routing tables (or routing stats) */
-int sflag; /* show protocol statistics */
-int tagflag; /* show route tags */
-int tflag; /* show i/f watchdog timers */
-int Vflag; /* show Vestigial TIME_WAIT (VTW) information */
-int vflag; /* verbose route information or don't truncate names */
-
-char *interface; /* desired i/f for stats, or NULL for all i/fs */
-
-int af; /* address family */
-int use_sysctl; /* use sysctl instead of kmem */
-int force_sysctl; /* force use of sysctl (or exit) - for testing */
+extern int hflag; /* humanize byte counts */
+extern int iflag; /* show interfaces */
+extern int Lflag; /* don't show LLINFO entries */
+extern int lflag; /* show routing table with use and ref */
+extern int mflag; /* show memory stats */
+extern int numeric_addr; /* show addresses numerically */
+extern int numeric_port; /* show ports numerically */
+extern int nflag; /* same as above, for show.c compat */
+extern int Pflag; /* dump a PCB */
+extern int pflag; /* show given protocol */
+extern int qflag; /* show softintrq */
+extern int rflag; /* show routing tables (or routing stats) */
+extern int sflag; /* show protocol statistics */
+extern int tagflag; /* show route tags */
+extern int tflag; /* show i/f watchdog timers */
+extern int Vflag; /* show Vestigial TIME_WAIT (VTW) information */
+extern int vflag; /* verbose route information or don't truncate names */
+
+extern char *interface; /* desired i/f for stats, or NULL for all i/fs */
+
+extern int af; /* address family */
+extern int use_sysctl; /* use sysctl instead of kmem
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:23:31 UTC 2020
Modified Files:
src/usr.bin/netstat: atalk.c
Log Message:
Avoid global scope for variables only used locally
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/netstat/atalk.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/netstat/atalk.c
diff -u src/usr.bin/netstat/atalk.c:1.17 src/usr.bin/netstat/atalk.c:1.18
--- src/usr.bin/netstat/atalk.c:1.17 Sun Aug 18 04:14:40 2019
+++ src/usr.bin/netstat/atalk.c Thu Apr 23 00:23:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atalk.c,v 1.17 2019/08/18 04:14:40 kamil Exp $ */
+/* $NetBSD: atalk.c,v 1.18 2020/04/23 00:23:31 joerg Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from @(#)atalk.c 1.1 (Whistle) 6/6/96";
#else
-__RCSID("$NetBSD: atalk.c,v 1.17 2019/08/18 04:14:40 kamil Exp $");
+__RCSID("$NetBSD: atalk.c,v 1.18 2020/04/23 00:23:31 joerg Exp $");
#endif
#endif /* not lint */
@@ -63,9 +63,6 @@ __RCSID("$NetBSD: atalk.c,v 1.17 2019/08
#include "netstat.h"
#include "prog_ops.h"
-struct ddpcbddpcb;
-struct socket sockb;
-
static int first = 1;
/*
@@ -230,6 +227,8 @@ atalk_print2(const struct sockaddr *sa,
void
atalkprotopr(u_long off, const char *name)
{
+ struct ddpcb ddpcb;
+ struct socket sockb;
struct ddpcb *next;
struct ddpcb *initial;
int width = 22;
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:24:16 UTC 2020
Modified Files:
src/usr.bin/netstat: inet6.c
Log Message:
sockb is only used locally, so move it into the function
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/netstat/inet6.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/netstat/inet6.c
diff -u src/usr.bin/netstat/inet6.c:1.73 src/usr.bin/netstat/inet6.c:1.74
--- src/usr.bin/netstat/inet6.c:1.73 Sun Aug 18 04:14:40 2019
+++ src/usr.bin/netstat/inet6.c Thu Apr 23 00:24:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: inet6.c,v 1.73 2019/08/18 04:14:40 kamil Exp $ */
+/* $NetBSD: inet6.c,v 1.74 2020/04/23 00:24:16 joerg Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
@@ -64,7 +64,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: inet6.c,v 1.73 2019/08/18 04:14:40 kamil Exp $");
+__RCSID("$NetBSD: inet6.c,v 1.74 2020/04/23 00:24:16 joerg Exp $");
#endif
#endif /* not lint */
@@ -147,7 +147,6 @@ struct tcp6cb tcp6cb;
#else
struct tcpcb tcpcb;
#endif
-struct socket sockb;
char *inet6name(const struct in6_addr *);
void inet6print(const struct in6_addr *, int, const char *);
@@ -283,8 +282,9 @@ print_vtw_v6(const vtw_t *vtw)
static struct kinfo_pcb *
-getpcblist_kmem(u_long off, const char *name, size_t *len) {
-
+getpcblist_kmem(u_long off, const char *name, size_t *len)
+{
+ struct socket sockb;
struct inpcbtable table;
struct inpcb_hdr *next, *prev;
int istcp = strcmp(name, "tcp6") == 0;
CVS commit: src/usr.sbin/mountd
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:22:01 UTC 2020
Modified Files:
src/usr.sbin/mountd: get_net.c mountd.c mountd.h
Log Message:
Rename debug to mountd_debug to avoid overlap in rump tests
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mountd/get_net.c
cvs rdiff -u -r1.130 -r1.131 src/usr.sbin/mountd/mountd.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/mountd/mountd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mountd/get_net.c
diff -u src/usr.sbin/mountd/get_net.c:1.2 src/usr.sbin/mountd/get_net.c:1.3
--- src/usr.sbin/mountd/get_net.c:1.2 Thu Dec 24 01:41:19 2015
+++ src/usr.sbin/mountd/get_net.c Thu Apr 23 00:22:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: get_net.c,v 1.2 2015/12/24 01:41:19 christos Exp $ */
+/* $NetBSD: get_net.c,v 1.3 2020/04/23 00:22:01 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -33,7 +33,7 @@
*/
#include
-__RCSID("$NetBSD: get_net.c,v 1.2 2015/12/24 01:41:19 christos Exp $");
+__RCSID("$NetBSD: get_net.c,v 1.3 2020/04/23 00:22:01 joerg Exp $");
#include
#include
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: get_net.c,v 1.2 2015/1
#ifdef TEST
int opt_flags;
const int ninumeric = NI_NUMERICHOST;
-int debug = 1;
+int mountd_debug = 1;
#endif
static int
@@ -145,7 +145,7 @@ get_net(char *cp, struct netmsk *net, in
sin.sin_family = AF_INET;
sin.sin_len = sizeof sin;
sin.sin_addr = inet_makeaddr(inet_network(cp), 0);
- if (debug)
+ if (mountd_debug)
fprintf(stderr, "get_net: '%s' v4 addr %x\n",
cp, sin.sin_addr.s_addr);
sa = (struct sockaddr *)
Index: src/usr.sbin/mountd/mountd.c
diff -u src/usr.sbin/mountd/mountd.c:1.130 src/usr.sbin/mountd/mountd.c:1.131
--- src/usr.sbin/mountd/mountd.c:1.130 Tue Jan 9 03:31:13 2018
+++ src/usr.sbin/mountd/mountd.c Thu Apr 23 00:22:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.130 2018/01/09 03:31:13 christos Exp $ */
+/* $NetBSD: mountd.c,v 1.131 2020/04/23 00:22:01 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.130 2018/01/09 03:31:13 christos Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.131 2020/04/23 00:22:01 joerg Exp $");
#endif
#endif/* not lint */
@@ -238,7 +238,7 @@ int opt_flags;
static int have_v6 = 1;
const int ninumeric = NI_NUMERICHOST;
-int debug = DEBUGGING;
+int mountd_debug = DEBUGGING;
#if 0
static void SYSLOG(int, const char *,...);
#endif
@@ -369,7 +369,7 @@ main(int argc, char **argv)
forcedport = atoi(optarg);
break;
case 'd':
- debug = 1;
+ mountd_debug = 1;
break;
case 'N':
noprivports = 1;
@@ -414,16 +414,16 @@ main(int argc, char **argv)
grphead = NULL;
exphead = NULL;
mlhead = NULL;
- openlog("mountd", LOG_PID | (debug ? LOG_PERROR : 0), LOG_DAEMON);
+ openlog("mountd", LOG_PID | (mountd_debug ? LOG_PERROR : 0), LOG_DAEMON);
(void)signal(SIGSYS, no_nfs);
- if (debug)
+ if (mountd_debug)
(void)fprintf(stderr, "Getting export list.\n");
get_exportlist(0);
- if (debug)
+ if (mountd_debug)
(void)fprintf(stderr, "Getting mount list.\n");
get_mountlist();
- if (debug)
+ if (mountd_debug)
(void)fprintf(stderr, "Here we go.\n");
(void)signal(SIGTERM, send_umntall);
@@ -547,7 +547,7 @@ main(int argc, char **argv)
exit(1);
}
- if (debug == 0) {
+ if (mountd_debug == 0) {
daemon(0, 0);
(void)signal(SIGINT, SIG_IGN);
(void)signal(SIGQUIT, SIG_IGN);
@@ -612,16 +612,16 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *t
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_MNT:
- if (debug)
+ if (mountd_debug)
fprintf(stderr,
"got mount request from %s\n", numerichost);
if (!svc_getargs(transp, xdr_dir, rpcpath)) {
- if (debug)
+ if (mountd_debug)
fprintf(stderr, "-> garbage args\n");
svcerr_decode(transp);
return;
}
- if (debug)
+ if (mountd_debug)
fprintf(stderr,
"-> rpcpath: %s\n", rpcpath);
/*
@@ -638,14 +638,14 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *t
(!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) ||
statvfs1(rdirpath, , ST_WAIT) < 0) {
(void)chdir("/"); /* Just in case realpath doesn't */
- if (debug)
+ if (mountd_debug)
(void)fprintf(stderr, "-> stat failed on %s\n",
rdirpath);
if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) ))
syslog(LOG_ERR, "Can't send reply");
return;
}
- if (debug)
+ if (mountd_debug)
fprintf(stderr,
"-> dirpath: %s\n", rdirpath);
/* Check in the exports list */
@@ -696,7 +696,7 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *t
add_mlist(host, rdirpath, hostset);
else
add_mlist(numerichost, rdirpath, hostset);
- if (debug)
+ if (mountd_debug)
CVS commit: src/usr.bin/indent
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:17:34 UTC 2020
Modified Files:
src/usr.bin/indent: indent.c indent_globs.h
Log Message:
Avoid common symbol declarations
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/indent/indent_globs.h
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/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.26 src/usr.bin/indent/indent.c:1.27
--- src/usr.bin/indent/indent.c:1.26 Sat Oct 19 15:44:31 2019
+++ src/usr.bin/indent/indent.c Thu Apr 23 00:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.26 2019/10/19 15:44:31 christos Exp $ */
+/* $NetBSD: indent.c,v 1.27 2020/04/23 00:17:34 joerg Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include
#ifndef lint
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.26 2019/10/19 15:44:31 christos Exp $");
+__RCSID("$NetBSD: indent.c,v 1.27 2020/04/23 00:17:34 joerg Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -69,6 +69,60 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/
#include "indent_codes.h"
#include "indent.h"
+struct options opt;
+struct parser_state ps;
+
+char *labbuf;
+char *s_lab;
+char *e_lab;
+char *l_lab;
+
+char *codebuf;
+char *s_code;
+char *e_code;
+char *l_code;
+
+char *combuf;
+char *s_com;
+char *e_com;
+char *l_com;
+
+char *tokenbuf;
+char *s_token;
+char *e_token;
+char *l_token;
+
+char *in_buffer;
+char *in_buffer_limit;
+char *buf_ptr;
+char *buf_end;
+
+charsc_buf[sc_size];
+char *save_com;
+char *sc_end;
+
+char *bp_save;
+char *be_save;
+
+int found_err;
+int n_real_blanklines;
+int prefix_blankline_requested;
+int postfix_blankline_requested;
+int break_comma;
+float case_ind;
+int code_lines;
+int had_eof;
+int line_no;
+int inhibit_formatting;
+int suppress_blanklines;
+
+int ifdef_level;
+struct parser_state state_stack[5];
+struct parser_state match_state[5];
+
+FILE *input;
+FILE *output;
+
static void bakcopy(void);
static void indent_declaration(int, int);
Index: src/usr.bin/indent/indent_globs.h
diff -u src/usr.bin/indent/indent_globs.h:1.11 src/usr.bin/indent/indent_globs.h:1.12
--- src/usr.bin/indent/indent_globs.h:1.11 Thu Apr 4 15:22:13 2019
+++ src/usr.bin/indent/indent_globs.h Thu Apr 23 00:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_globs.h,v 1.11 2019/04/04 15:22:13 kamil Exp $ */
+/* $NetBSD: indent_globs.h,v 1.12 2020/04/23 00:17:34 joerg Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -51,8 +51,8 @@
#define true 1
-FILE *input; /* the fid for the input file */
-FILE *output; /* the output file */
+extern FILE *input; /* the fid for the input file */
+extern FILE *output; /* the output file */
#define CHECK_SIZE_CODE(desired_size) \
if (e_code + (desired_size) >= l_code) { \
@@ -106,44 +106,44 @@ FILE *output; /* the output file
s_token = tokenbuf + 1; \
}
-char *labbuf; /* buffer for label */
-char *s_lab; /* start ... */
-char *e_lab; /* .. and end of stored label */
-char *l_lab; /* limit of label buffer */
-
-char *codebuf; /* buffer for code section */
-char *s_code; /* start ... */
-char *e_code; /* .. and end of stored code */
-char *l_code; /* limit of code section */
-
-char *combuf; /* buffer for comments */
-char *s_com; /* start ... */
-char *e_com; /* ... and end of stored comments */
-char *l_com; /* limit of comment buffer */
+extern char *labbuf; /* buffer for label */
+extern char *s_lab; /* start ... */
+extern char *e_lab; /* .. and end of stored label */
+extern char *l_lab; /* limit of label buffer */
+
+extern char *codebuf; /* buffer for code section */
+extern char *s_code; /* start ... */
+extern char *e_code; /* .. and end of stored code */
+extern char *l_code; /* limit of code section */
+
+extern char *combuf; /* buffer for comments */
+extern char *s_com; /* start ... */
+extern char *e_com; /* ... and end of stored comments */
+extern char *l_com; /* limit of comment buffer */
#define token s_token
-char *tokenbuf; /* the last token scanned */
-char *s_token;
-char *e_token;
-char *l_token;
-
-char *in_buffer; /* input buffer */
-char *in_buffer_limit; /* the end of the input buffer */
-char *buf_ptr; /* ptr to next character to be taken
CVS commit: src/sys/arch/macppc/stand/ofwboot
Module Name:src Committed By: joerg Date: Thu Apr 23 00:12:28 UTC 2020 Modified Files: src/sys/arch/macppc/stand/ofwboot: boot.c Log Message: bootfile is owned by libsa To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/stand/ofwboot/boot.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/macppc/stand/ofwboot/boot.c diff -u src/sys/arch/macppc/stand/ofwboot/boot.c:1.29 src/sys/arch/macppc/stand/ofwboot/boot.c:1.30 --- src/sys/arch/macppc/stand/ofwboot/boot.c:1.29 Wed Jun 6 22:56:25 2018 +++ src/sys/arch/macppc/stand/ofwboot/boot.c Thu Apr 23 00:12:28 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.c,v 1.29 2018/06/06 22:56:25 uwe Exp $ */ +/* $NetBSD: boot.c,v 1.30 2020/04/23 00:12:28 joerg Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ extern void __syncicache(void *, size_t) #endif char bootdev[MAXBOOTPATHLEN]; -char bootfile[MAXBOOTPATHLEN]; +extern char bootfile[MAXBOOTPATHLEN]; int boothowto; bool floppyboot; int ofw_version = 0;
CVS commit: src/sys/arch/sparc/stand/bootxx
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:11:29 UTC 2020
Modified Files:
src/sys/arch/sparc/stand/bootxx: Makefile
Log Message:
Uses LFS boot code
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/stand/bootxx/Makefile
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/sparc/stand/bootxx/Makefile
diff -u src/sys/arch/sparc/stand/bootxx/Makefile:1.17 src/sys/arch/sparc/stand/bootxx/Makefile:1.18
--- src/sys/arch/sparc/stand/bootxx/Makefile:1.17 Sun Jan 12 15:26:31 2014
+++ src/sys/arch/sparc/stand/bootxx/Makefile Thu Apr 23 00:11:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/01/12 15:26:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18 2020/04/23 00:11:29 joerg Exp $
PROG= bootxx
PROGSOURCE= bootxx.c
@@ -10,6 +10,11 @@ STRIPFLAG=
LINKFLAGS= -N -Ttext ${RELOC_BOOTXX} -e start
CLEANFILES+= ${PROG}.sym
+# Follow the suit of Makefile.kern.inc; needed for the lfs64 union
+# accessors -- they don't actually dereference the resulting pointer,
+# just use it for type-checking.
+CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
+
# XXX SHOULD NOT NEED TO DEFINE THESE!
LIBCRT0=
LIBCRTI=
CVS commit: src/sys/arch
Module Name:src Committed By: joerg Date: Thu Apr 23 00:09:26 UTC 2020 Modified Files: src/sys/arch/macppc/stand/ofwboot: net.c src/sys/arch/sparc/stand/common: net.c src/sys/arch/sparc/stand/ofwboot: net.c Log Message: rootpath is owned by libsa To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/stand/ofwboot/net.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/stand/common/net.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/ofwboot/net.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/macppc/stand/ofwboot/net.c diff -u src/sys/arch/macppc/stand/ofwboot/net.c:1.8 src/sys/arch/macppc/stand/ofwboot/net.c:1.9 --- src/sys/arch/macppc/stand/ofwboot/net.c:1.8 Fri Jan 27 03:58:27 2006 +++ src/sys/arch/macppc/stand/ofwboot/net.c Thu Apr 23 00:09:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.8 2006/01/27 03:58:27 uwe Exp $ */ +/* $NetBSD: net.c,v 1.9 2020/04/23 00:09:26 joerg Exp $ */ /* * Copyright (C) 1995 Wolfgang Solfrank. @@ -69,7 +69,7 @@ #include "ofdev.h" #include "netif_of.h" -char rootpath[FNAME_SIZE]; +extern char rootpath[FNAME_SIZE]; static int netdev_sock = -1; static int open_count; Index: src/sys/arch/sparc/stand/common/net.c diff -u src/sys/arch/sparc/stand/common/net.c:1.9 src/sys/arch/sparc/stand/common/net.c:1.10 --- src/sys/arch/sparc/stand/common/net.c:1.9 Wed Oct 21 23:12:09 2009 +++ src/sys/arch/sparc/stand/common/net.c Thu Apr 23 00:09:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.9 2009/10/21 23:12:09 snj Exp $ */ +/* $NetBSD: net.c,v 1.10 2020/04/23 00:09:26 joerg Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -60,7 +60,7 @@ #include -char rootpath[FNAME_SIZE]; +extern char rootpath[FNAME_SIZE]; int netdev_sock = -1; static int open_count; Index: src/sys/arch/sparc/stand/ofwboot/net.c diff -u src/sys/arch/sparc/stand/ofwboot/net.c:1.8 src/sys/arch/sparc/stand/ofwboot/net.c:1.9 --- src/sys/arch/sparc/stand/ofwboot/net.c:1.8 Mon Jul 16 11:26:27 2012 +++ src/sys/arch/sparc/stand/ofwboot/net.c Thu Apr 23 00:09:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: net.c,v 1.8 2012/07/16 11:26:27 tsutsui Exp $ */ +/* $NetBSD: net.c,v 1.9 2020/04/23 00:09:26 joerg Exp $ */ /* * Copyright (C) 1995 Wolfgang Solfrank. @@ -73,7 +73,7 @@ static int net_mountroot_bootparams(void); static int net_mountroot_bootp(void); -char rootpath[FNAME_SIZE]; +extern char rootpath[FNAME_SIZE]; static int netdev_sock = -1; static int open_count;
CVS commit: src/libexec/telnetd
Module Name:src
Committed By: joerg
Date: Thu Apr 23 00:03:41 UTC 2020
Modified Files:
src/libexec/telnetd: ext.h global.c
Log Message:
Don't play #define games with extern, just have a separate list to avoid commons
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/libexec/telnetd/ext.h
cvs rdiff -u -r1.8 -r1.9 src/libexec/telnetd/global.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/telnetd/ext.h
diff -u src/libexec/telnetd/ext.h:1.22 src/libexec/telnetd/ext.h:1.23
--- src/libexec/telnetd/ext.h:1.22 Tue Jan 10 23:39:11 2012
+++ src/libexec/telnetd/ext.h Thu Apr 23 00:03:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ext.h,v 1.22 2012/01/10 23:39:11 joerg Exp $ */
+/* $NetBSD: ext.h,v 1.23 2020/04/23 00:03:40 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -179,7 +179,7 @@ extern char *nclearto;
* The following are some clocks used to decide how to interpret
* the relationship between various variables.
*/
-extern struct {
+extern struct clockstate {
int
system, /* what the current time is */
echotoggle, /* last time user entered echo character */
Index: src/libexec/telnetd/global.c
diff -u src/libexec/telnetd/global.c:1.8 src/libexec/telnetd/global.c:1.9
--- src/libexec/telnetd/global.c:1.8 Thu Aug 7 09:46:51 2003
+++ src/libexec/telnetd/global.c Thu Apr 23 00:03:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: global.c,v 1.8 2003/08/07 09:46:51 agc Exp $ */
+/* $NetBSD: global.c,v 1.9 2020/04/23 00:03:40 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: global.c,v 1.8 2003/08/07 09:46:51 agc Exp $");
+__RCSID("$NetBSD: global.c,v 1.9 2020/04/23 00:03:40 joerg Exp $");
#endif
#endif /* not lint */
@@ -47,5 +47,50 @@ __RCSID("$NetBSD: global.c,v 1.8 2003/08
*/
#include
-#define extern
#include
+
+char options[256];
+char do_dont_resp[256];
+char will_wont_resp[256];
+int linemode; /* linemode on/off */
+#ifdef LINEMODE
+int uselinemode; /* what linemode to use (on/off) */
+int editmode; /* edit modes in use */
+int useeditmode; /* edit modes to use */
+int alwayslinemode; /* command line option */
+# ifdef KLUDGELINEMODE
+int lmodetype; /* Client support for linemode */
+# endif /* KLUDGELINEMODE */
+#endif /* LINEMODE */
+int flowmode; /* current flow control state */
+int restartany; /* restart output on any character state */
+#ifdef DIAGNOSTICS
+int diagnostic; /* telnet diagnostic capabilities */
+#endif /* DIAGNOSTICS */
+#ifdef SECURELOGIN
+int require_secure_login;
+#endif
+#ifdef AUTHENTICATION
+int auth_level;
+#endif
+
+slcfun slctab[NSLC + 1]; /* slc mapping table */
+char terminaltype[41];
+
+/*
+ * I/O data buffers, pointers, and counters.
+ */
+char ptyobuf[BUFSIZ+NETSLOP], *pfrontp, *pbackp;
+char netibuf[BUFSIZ], *netip;
+char netobuf[BUFSIZ+NETSLOP], *nfrontp, *nbackp;
+char *neturg; /* one past last bye of urgent data */
+int pcc, ncc;
+int pty, net;
+char *line;
+int SYNCHing; /* we are in TELNET SYNCH mode */
+
+#ifdef ENCRYPTION
+char *nclearto;
+#endif /* ENCRYPTION */
+
+struct clockstate clocks;
CVS commit: src/usr.sbin/mopd
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:57:56 UTC 2020
Modified Files:
src/usr.sbin/mopd/mopchk: mopchk.c
src/usr.sbin/mopd/mopd: mopd.c
src/usr.sbin/mopd/mopprobe: mopprobe.c
src/usr.sbin/mopd/moptrace: moptrace.c
Log Message:
loop.c owns iflist
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/mopd/mopchk/mopchk.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mopd/mopd/mopd.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/mopprobe/mopprobe.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/moptrace/moptrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/mopchk/mopchk.c
diff -u src/usr.sbin/mopd/mopchk/mopchk.c:1.14 src/usr.sbin/mopd/mopchk/mopchk.c:1.15
--- src/usr.sbin/mopd/mopchk/mopchk.c:1.14 Wed Jun 8 01:15:26 2016
+++ src/usr.sbin/mopd/mopchk/mopchk.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $ */
+/* $NetBSD: mopchk.c,v 1.15 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopchk.c,v 1.14 2016/06/08 01:15:26 christos Exp $");
+__RCSID("$NetBSD: mopchk.c,v 1.15 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: mopchk.c,v 1.14 2016/0
* The list of all interfaces that are being listened to. rarp_loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/mopd/mopd.c
diff -u src/usr.sbin/mopd/mopd/mopd.c:1.15 src/usr.sbin/mopd/mopd/mopd.c:1.16
--- src/usr.sbin/mopd/mopd/mopd.c:1.15 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/mopd/mopd.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopd.c,v 1.15 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: mopd.c,v 1.16 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopd.c,v 1.15 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: mopd.c,v 1.16 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: mopd.c,v 1.15 2016/06/
* The list of all interfaces that are being listened to.
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/mopprobe/mopprobe.c
diff -u src/usr.sbin/mopd/mopprobe/mopprobe.c:1.13 src/usr.sbin/mopd/mopprobe/mopprobe.c:1.14
--- src/usr.sbin/mopd/mopprobe/mopprobe.c:1.13 Wed Jun 8 01:17:54 2016
+++ src/usr.sbin/mopd/mopprobe/mopprobe.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $ */
+/* $NetBSD: mopprobe.c,v 1.14 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: mopprobe.c,v 1.13 2016/06/08 01:17:54 christos Exp $");
+__RCSID("$NetBSD: mopprobe.c,v 1.14 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: mopprobe.c,v 1.13 2016
* The list of all interfaces that are being listened to. rarp_loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/moptrace/moptrace.c
diff -u src/usr.sbin/mopd/moptrace/moptrace.c:1.12 src/usr.sbin/mopd/moptrace/moptrace.c:1.13
--- src/usr.sbin/mopd/moptrace/moptrace.c:1.12 Wed Jun 8 01:19:05 2016
+++ src/usr.sbin/mopd/moptrace/moptrace.c Wed Apr 22 23:57:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $ */
+/* $NetBSD: moptrace.c,v 1.13 2020/04/22 23:57:56 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: moptrace.c,v 1.12 2016/06/08 01:19:05 christos Exp $");
+__RCSID("$NetBSD: moptrace.c,v 1.13 2020/04/22 23:57:56 joerg Exp $");
#endif
/*
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: moptrace.c,v 1.12 2016
* The list of all interfaces that are being listened to.
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
__dead static void Usage(void);
void mopProcess(struct if_info *, u_char *);
CVS commit: src/usr.sbin/mopd/common
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:55:29 UTC 2020
Modified Files:
src/usr.sbin/mopd/common: loop-bsd.c loop-linux2.c
Log Message:
Let loop.c own iflist
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/common/loop-bsd.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/mopd/common/loop-linux2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/common/loop-bsd.c
diff -u src/usr.sbin/mopd/common/loop-bsd.c:1.12 src/usr.sbin/mopd/common/loop-bsd.c:1.13
--- src/usr.sbin/mopd/common/loop-bsd.c:1.12 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/loop-bsd.c Wed Apr 22 23:55:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: loop-bsd.c,v 1.12 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: loop-bsd.c,v 1.13 2020/04/22 23:55:29 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: loop-bsd.c,v 1.12 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: loop-bsd.c,v 1.13 2020/04/22 23:55:29 joerg Exp $");
#endif
#include
@@ -87,7 +87,7 @@ mopReadDL(void)
* The list of all interfaces that are being listened to. loop()
* "polls" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
void mopProcess(struct if_info *, u_char *);
Index: src/usr.sbin/mopd/common/loop-linux2.c
diff -u src/usr.sbin/mopd/common/loop-linux2.c:1.2 src/usr.sbin/mopd/common/loop-linux2.c:1.3
--- src/usr.sbin/mopd/common/loop-linux2.c:1.2 Sat Dec 7 04:55:01 2019
+++ src/usr.sbin/mopd/common/loop-linux2.c Wed Apr 22 23:55:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $ */
+/* $NetBSD: loop-linux2.c,v 1.3 2020/04/22 23:55:29 joerg Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -26,7 +26,7 @@
#include "port.h"
#ifndef lint
-__RCSID("$NetBSD: loop-linux2.c,v 1.2 2019/12/07 04:55:01 christos Exp $");
+__RCSID("$NetBSD: loop-linux2.c,v 1.3 2020/04/22 23:55:29 joerg Exp $");
#endif
#include
@@ -82,7 +82,7 @@ mopReadDL(void)
* The list of all interfaces that are being listened to. loop()
* "selects" on the descriptors in this list.
*/
-struct if_info *iflist;
+extern struct if_info *iflist;
void mopProcess(struct if_info *, u_char *);
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:54:32 UTC 2020
Modified Files:
src/libexec/ld.elf_so: search.c
Log Message:
Mark _rtld_invalid_paths static as ldd can end up with two copies
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/libexec/ld.elf_so/search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/search.c
diff -u src/libexec/ld.elf_so/search.c:1.26 src/libexec/ld.elf_so/search.c:1.27
--- src/libexec/ld.elf_so/search.c:1.26 Sun Oct 13 20:18:42 2019
+++ src/libexec/ld.elf_so/search.c Wed Apr 22 23:54:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.26 2019/10/13 20:18:42 mrg Exp $ */
+/* $NetBSD: search.c,v 1.27 2020/04/22 23:54:32 joerg Exp $ */
/*
* Copyright 1996 Matt Thomas
@@ -38,7 +38,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: search.c,v 1.26 2019/10/13 20:18:42 mrg Exp $");
+__RCSID("$NetBSD: search.c,v 1.27 2020/04/22 23:54:32 joerg Exp $");
#endif /* not lint */
#include
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: search.c,v 1.26 2019/1
/*
* Data declarations.
*/
-Search_Path*_rtld_invalid_paths;
+static Search_Path*_rtld_invalid_paths;
static Obj_Entry *_rtld_search_library_path(const char *, size_t,
const char *, size_t, int);
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:53:27 UTC 2020
Modified Files:
src/usr.sbin/ldpd: conffile.c conffile.h ldp_peer.c ldp_peer.h
socketops.c socketops.h
Log Message:
Avoid common symbol definitions
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/ldpd/conffile.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/ldpd/conffile.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/ldp_peer.h
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/ldpd/socketops.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/ldpd/socketops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/conffile.c
diff -u src/usr.sbin/ldpd/conffile.c:1.12 src/usr.sbin/ldpd/conffile.c:1.13
--- src/usr.sbin/ldpd/conffile.c:1.12 Tue Jan 10 21:02:38 2017
+++ src/usr.sbin/ldpd/conffile.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: conffile.c,v 1.12 2017/01/10 21:02:38 christos Exp $ */
+/* $NetBSD: conffile.c,v 1.13 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -47,6 +47,9 @@
#define NextCommand(x) strsep(, " ")
#define LINEMAXSIZE 1024
+struct coifs_head coifs_head;
+struct conei_head conei_head;
+
char *mapped, *nextline;
size_t mapsize;
Index: src/usr.sbin/ldpd/conffile.h
diff -u src/usr.sbin/ldpd/conffile.h:1.4 src/usr.sbin/ldpd/conffile.h:1.5
--- src/usr.sbin/ldpd/conffile.h:1.4 Thu Oct 17 18:10:23 2013
+++ src/usr.sbin/ldpd/conffile.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: conffile.h,v 1.4 2013/10/17 18:10:23 kefren Exp $ */
+/* $NetBSD: conffile.h,v 1.5 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ struct conf_neighbour {
int authenticate; /* RFC 2385 */
SLIST_ENTRY(conf_neighbour) neilist;
};
-SLIST_HEAD(,conf_neighbour) conei_head;
+extern SLIST_HEAD(conei_head,conf_neighbour) conei_head;
struct conf_interface {
char if_name[IF_NAMESIZE];
@@ -57,7 +57,7 @@ struct conf_interface {
int passive;
SLIST_ENTRY(conf_interface) iflist;
};
-SLIST_HEAD(,conf_interface) coifs_head;
+extern SLIST_HEAD(coifs_head,conf_interface) coifs_head;
int conf_parsefile(const char *fname);
Index: src/usr.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.16 src/usr.sbin/ldpd/ldp_peer.c:1.17
--- src/usr.sbin/ldpd/ldp_peer.c:1.16 Fri Aug 2 07:29:56 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.16 2013/08/02 07:29:56 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.17 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -55,6 +55,7 @@
#include "ldp_peer.h"
extern int ldp_holddown_time;
+struct ldp_peer_head ldp_peer_head;
static struct label_mapping *ldp_peer_get_lm(struct ldp_peer *,
const struct sockaddr *, uint);
Index: src/usr.sbin/ldpd/ldp_peer.h
diff -u src/usr.sbin/ldpd/ldp_peer.h:1.8 src/usr.sbin/ldpd/ldp_peer.h:1.9
--- src/usr.sbin/ldpd/ldp_peer.h:1.8 Fri Aug 2 07:29:56 2013
+++ src/usr.sbin/ldpd/ldp_peer.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.h,v 1.8 2013/08/02 07:29:56 kefren Exp $ */
+/* $NetBSD: ldp_peer.h,v 1.9 2020/04/22 23:53:27 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ struct ldp_peer {
SLIST_ENTRY(ldp_peer) peers;
};
-SLIST_HEAD(,ldp_peer) ldp_peer_head;
+extern SLIST_HEAD(ldp_peer_head,ldp_peer) ldp_peer_head;
struct peer_map {
struct ldp_peer *peer;
Index: src/usr.sbin/ldpd/socketops.c
diff -u src/usr.sbin/ldpd/socketops.c:1.34 src/usr.sbin/ldpd/socketops.c:1.35
--- src/usr.sbin/ldpd/socketops.c:1.34 Wed Apr 12 17:02:51 2017
+++ src/usr.sbin/ldpd/socketops.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.c,v 1.34 2017/04/12 17:02:51 roy Exp $ */
+/* $NetBSD: socketops.c,v 1.35 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -61,6 +61,9 @@
#include "ldp_errors.h"
#include "socketops.h"
+struct hello_info_head hello_info_head;
+static SLIST_HEAD(,hello_socket) hello_socket_head;
+
int ls;/* TCP listening socket on port 646 */
int route_socket; /* used to see when a route is added/deleted */
int command_socket; /* Listening socket for interface command */
Index: src/usr.sbin/ldpd/socketops.h
diff -u src/usr.sbin/ldpd/socketops.h:1.6 src/usr.sbin/ldpd/socketops.h:1.7
--- src/usr.sbin/ldpd/socketops.h:1.6 Thu Jul 11 05:45:23 2013
+++ src/usr.sbin/ldpd/socketops.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.h,v 1.6 2013/07/11 05:45:23 kefren Exp $ */
+/* $NetBSD: socketops.h,v 1.7 2020/04/22 23:53:27 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,12 +62,11 @@ struct hello_info {
int keepalive;
SLIST_ENTRY(hello_info) infos;
};
CVS commit: src/usr.sbin/envstat
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:51:34 UTC 2020
Modified Files:
src/usr.sbin/envstat: config_yacc.y
Log Message:
Externalize yytext, it belongs to the lexer
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/envstat/config_yacc.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/envstat/config_yacc.y
diff -u src/usr.sbin/envstat/config_yacc.y:1.5 src/usr.sbin/envstat/config_yacc.y:1.6
--- src/usr.sbin/envstat/config_yacc.y:1.5 Thu Mar 15 02:02:23 2012
+++ src/usr.sbin/envstat/config_yacc.y Wed Apr 22 23:51:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: config_yacc.y,v 1.5 2012/03/15 02:02:23 joerg Exp $ */
+/* $NetBSD: config_yacc.y,v 1.6 2020/04/22 23:51:34 joerg Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: config_yacc.y,v 1.5 2012/03/15 02:02:23 joerg Exp $");
+__RCSID("$NetBSD: config_yacc.y,v 1.6 2020/04/22 23:51:34 joerg Exp $");
#endif /* not lint */
#include
@@ -50,7 +50,7 @@ int yyerror(const char *, ...) __printfl
void yyrestart(FILE *);
int yyline;
-char *yytext;
+extern char *yytext;
static prop_dictionary_t kdict;
%}
CVS commit: src/usr.sbin/rpc.bootparamd
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:47:02 UTC 2020
Modified Files:
src/usr.sbin/rpc.bootparamd: bootparamd.c
Log Message:
_rpcpmstart is defined by rpcgen, so externalize it here
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/rpc.bootparamd/bootparamd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpc.bootparamd/bootparamd.c
diff -u src/usr.sbin/rpc.bootparamd/bootparamd.c:1.47 src/usr.sbin/rpc.bootparamd/bootparamd.c:1.48
--- src/usr.sbin/rpc.bootparamd/bootparamd.c:1.47 Thu Aug 15 08:34:19 2019
+++ src/usr.sbin/rpc.bootparamd/bootparamd.c Wed Apr 22 23:47:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bootparamd.c,v 1.47 2019/08/15 08:34:19 kamil Exp $ */
+/* $NetBSD: bootparamd.c,v 1.48 2020/04/22 23:47:02 joerg Exp $ */
/*
* This code is not copyright, and is placed in the public domain.
@@ -11,7 +11,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: bootparamd.c,v 1.47 2019/08/15 08:34:19 kamil Exp $");
+__RCSID("$NetBSD: bootparamd.c,v 1.48 2020/04/22 23:47:02 joerg Exp $");
#endif
#include
@@ -56,7 +56,7 @@ static char domain_name[MAX_MACHINE_NAME
extern void bootparamprog_1(struct svc_req *, SVCXPRT *);
extern int _rpcsvcdirty;
-int _rpcpmstart = 0;
+extern int _rpcpmstart;
int debug = 0;
int dolog = 0;
struct in_addr route_addr;
CVS commit: src/usr.sbin/rpc.pcnfsd
Module Name:src Committed By: joerg Date: Wed Apr 22 23:46:03 UTC 2020 Modified Files: src/usr.sbin/rpc.pcnfsd: pcnfsd_misc.c pcnfsd_print.c Log Message: tempstr is only used in one file, make it static To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c diff -u src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.16 src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.17 --- src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c:1.16 Tue Jan 23 21:06:25 2018 +++ src/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c Wed Apr 22 23:46:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pcnfsd_misc.c,v 1.16 2018/01/23 21:06:25 sevan Exp $ */ +/* $NetBSD: pcnfsd_misc.c,v 1.17 2020/04/22 23:46:02 joerg Exp $ */ /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_misc.c 1.5 92/01/24 19:59:13 SMI */ /* @@ -65,8 +65,6 @@ int wtmp_enabled = 1; #define zchar 0x5b -chartempstr[256]; - char *mapfont(char, char, char); void myhandler(int); void start_watchdog(int); Index: src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c diff -u src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c:1.15 src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c:1.16 --- src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c:1.15 Fri Dec 27 10:20:02 2019 +++ src/usr.sbin/rpc.pcnfsd/pcnfsd_print.c Wed Apr 22 23:46:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pcnfsd_print.c,v 1.15 2019/12/27 10:20:02 msaitoh Exp $ */ +/* $NetBSD: pcnfsd_print.c,v 1.16 2020/04/22 23:46:02 joerg Exp $ */ /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_print.c 1.7 92/01/24 19:58:58 SMI */ /* @@ -92,7 +92,7 @@ struct stat statbuf; charpathname[MAXPATHLEN]; charnew_pathname[MAXPATHLEN]; charsp_name[MAXPATHLEN] = SPOOLDIR; -chartempstr[256]; +static char tempstr[256]; chardelims[] = " \t\r\n:()"; pr_list printers = NULL;
CVS commit: src/dist/pf/sbin/pfctl
Module Name:src Committed By: joerg Date: Wed Apr 22 23:40:40 UTC 2020 Modified Files: src/dist/pf/sbin/pfctl: pfctl.c Log Message: Externalize variables owned logically by pf_ruleset.c To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/dist/pf/sbin/pfctl/pfctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pf/sbin/pfctl/pfctl.c diff -u src/dist/pf/sbin/pfctl/pfctl.c:1.5 src/dist/pf/sbin/pfctl/pfctl.c:1.6 --- src/dist/pf/sbin/pfctl/pfctl.c:1.5 Wed Jun 18 09:06:26 2008 +++ src/dist/pf/sbin/pfctl/pfctl.c Wed Apr 22 23:40:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pfctl.c,v 1.5 2008/06/18 09:06:26 yamt Exp $ */ +/* $NetBSD: pfctl.c,v 1.6 2020/04/22 23:40:40 joerg Exp $ */ /* $OpenBSD: pfctl.c,v 1.268 2007/06/30 18:25:08 henning Exp $ */ /* @@ -96,8 +96,8 @@ int pfctl_load_ruleset(struct pfctl *, int pfctl_load_rule(struct pfctl *, char *, struct pf_rule *, int); const char *pfctl_lookup_option(char *, const char **); -struct pf_anchor_global pf_anchors; -struct pf_anchor pf_main_anchor; +extern struct pf_anchor_global pf_anchors; +extern struct pf_anchor pf_main_anchor; const char *clearopt; char *rulesopt;
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:43:12 UTC 2020
Modified Files:
src/usr.sbin/sysinst: defs.h main.c mbr.c mbr.h
Log Message:
Don't depend on common symbol definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sysinst/mbr.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/mbr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.57 src/usr.sbin/sysinst/defs.h:1.58
--- src/usr.sbin/sysinst/defs.h:1.57 Mon Mar 16 06:48:17 2020
+++ src/usr.sbin/sysinst/defs.h Wed Apr 22 23:43:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.57 2020/03/16 06:48:17 martin Exp $ */
+/* $NetBSD: defs.h,v 1.58 2020/04/22 23:43:12 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -360,31 +360,31 @@ struct install_partition_desc {
/* variables */
-int debug; /* set by -D option */
+extern int debug; /* set by -D option */
-char machine[SSTRSIZE];
+extern char machine[SSTRSIZE];
-int ignorerror;
-int ttysig_ignore;
-pid_t ttysig_forward;
-uint sizemult;
+extern int ignorerror;
+extern int ttysig_ignore;
+extern pid_t ttysig_forward;
+extern uint sizemult;
extern const char *multname;
extern const char *err_outofmem;
-int partman_go; /* run extended partition manager */
+extern int partman_go; /* run extended partition manager */
/* logging variables */
-FILE *logfp;
-FILE *script;
+extern FILE *logfp;
+extern FILE *script;
#define MAX_DISKS 15
-daddr_t root_limit;/* BIOS (etc) read limit */
+extern daddr_t root_limit;/* BIOS (etc) read limit */
enum SHRED_T { SHRED_NONE=0, SHRED_ZEROS, SHRED_RANDOM };
/* All information that is unique for each drive */
-SLIST_HEAD(pm_head_t, pm_devs) pm_head;
+extern SLIST_HEAD(pm_head_t, pm_devs) pm_head;
struct pm_devs {
/*
@@ -453,8 +453,8 @@ struct pm_devs {
SLIST_ENTRY(pm_devs) l;
};
-struct pm_devs *pm; /* Pointer to current device with which we work */
-struct pm_devs *pm_new; /* Pointer for next allocating device in find_disks() */
+extern struct pm_devs *pm; /* Pointer to current device with which we work */
+extern struct pm_devs *pm_new; /* Pointer for next allocating device in find_disks() */
/* Generic structure for partman */
struct part_entry {
@@ -469,8 +469,8 @@ struct part_entry {
};
/* Relative file name for storing a distribution. */
-char xfer_dir[STRSIZE];
-int clean_xfer_dir;
+extern char xfer_dir[STRSIZE];
+extern int clean_xfer_dir;
#if !defined(SYSINST_FTP_HOST)
#define SYSINST_FTP_HOST "ftp.NetBSD.org"
@@ -530,28 +530,28 @@ int clean_xfer_dir;
#endif
/* Abs. path we extract binary sets from */
-char ext_dir_bin[STRSIZE];
+extern char ext_dir_bin[STRSIZE];
/* Abs. path we extract source sets from */
-char ext_dir_src[STRSIZE];
+extern char ext_dir_src[STRSIZE];
/* Abs. path we extract pkgsrc from */
-char ext_dir_pkgsrc[STRSIZE];
+extern char ext_dir_pkgsrc[STRSIZE];
/* Place we look for binary sets in all fs types */
-char set_dir_bin[STRSIZE];
+extern char set_dir_bin[STRSIZE];
/* Place we look for source sets in all fs types */
-char set_dir_src[STRSIZE];
+extern char set_dir_src[STRSIZE];
/* Place we look for pkgs in all fs types */
-char pkg_dir[STRSIZE];
+extern char pkg_dir[STRSIZE];
/* Place we look for pkgsrc in all fs types */
-char pkgsrc_dir[STRSIZE];
+extern char pkgsrc_dir[STRSIZE];
/* User shell */
-const char *ushell;
+extern const char *ushell;
#define XFER_FTP 0
#define XFER_HTTP 1
@@ -567,26 +567,26 @@ struct ftpinfo {
};
/* use the same struct for sets ftp and to build pkgpath */
-struct ftpinfo ftp, pkg, pkgsrc;
+extern struct ftpinfo ftp, pkg, pkgsrc;
-int (*fetch_fn)(const char *);
-char nfs_host[STRSIZE];
-char nfs_dir[STRSIZE];
+extern int (*fetch_fn)(const char *);
+extern char nfs_host[STRSIZE];
+extern char nfs_dir[STRSIZE];
-char cdrom_dev[SSTRSIZE]; /* Typically "cd0a" */
-char fd_dev[SSTRSIZE]; /* Typically "/dev/fd0a" */
-const char *fd_type; /* "msdos", "ffs" or maybe "ados" */
+extern char cdrom_dev[SSTRSIZE]; /* Typically "cd0a" */
+extern char fd_dev[SSTRSIZE]; /* Typically "/dev/fd0a" */
+extern const char *fd_type; /* "msdos", "ffs" or maybe "ados" */
-char localfs_dev[SSTRSIZE];
-char localfs_fs[SSTRSIZE];
-char localfs_dir[STRSIZE];
+extern char localfs_dev[SSTRSIZE];
+extern char localfs_fs[SSTRSIZE];
+extern char localfs_dir[STRSIZE];
-char targetroot_mnt[SSTRSIZE];
+extern char targetroot_mnt[SSTRSIZE];
-int mnt2_mounted;
+extern int mnt2_mounted;
-char dist_postfix[SSTRSIZE];
-char dist_tgz_postfix[SSTRSIZE];
+extern char dist_postfix[SSTRSIZE];
+extern char dist_tgz_postfix[SSTRSIZE];
/* needed prototypes */
void set_menu_numopts(int, int);
@@
CVS commit: src/games/backgammon/common_source
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:36:26 UTC 2020
Modified Files:
src/games/backgammon/common_source: back.h fancy.c
Log Message:
buffnum is shared between subs.c and fancy.c
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/common_source/back.h
cvs rdiff -u -r1.14 -r1.15 src/games/backgammon/common_source/fancy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/back.h
diff -u src/games/backgammon/common_source/back.h:1.20 src/games/backgammon/common_source/back.h:1.21
--- src/games/backgammon/common_source/back.h:1.20 Sat Oct 13 19:19:39 2012
+++ src/games/backgammon/common_source/back.h Wed Apr 22 23:36:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: back.h,v 1.20 2012/10/13 19:19:39 dholland Exp $ */
+/* $NetBSD: back.h,v 1.21 2020/04/22 23:36:26 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -124,6 +124,8 @@ extern const char *const *colorptr; /* c
extern const char *const *Colorptr; /* color of current player, capitalized */
extern int colen; /* length of color of current player */
+extern int buffnum;
+
extern struct termios old, noech, raw;/* original tty status */
extern int curr; /* row position of cursor */
Index: src/games/backgammon/common_source/fancy.c
diff -u src/games/backgammon/common_source/fancy.c:1.14 src/games/backgammon/common_source/fancy.c:1.15
--- src/games/backgammon/common_source/fancy.c:1.14 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/common_source/fancy.c Wed Apr 22 23:36:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fancy.c,v 1.14 2009/08/12 05:17:57 dholland Exp $ */
+/* $NetBSD: fancy.c,v 1.15 2020/04/22 23:36:26 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fancy.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fancy.c,v 1.14 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: fancy.c,v 1.15 2020/04/22 23:36:26 joerg Exp $");
#endif
#endif /* not lint */
@@ -78,8 +78,6 @@ static char tcap[] = "bccdceclcmhomcmlnd
/* corresponding strings */
static char **tstr[] = {, , , , , , , , , };
-int buffnum; /* pointer to output buffer */
-
static char tbuf[1024]; /* buffer for decoded termcap entries */
static int oldb[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
CVS commit: src/lib
Module Name:src
Committed By: joerg
Date: Wed Apr 22 23:32:25 UTC 2020
Modified Files:
src/lib/csu: Makefile
src/lib/libc/gen: Makefile.inc
src/lib/libc/misc: Makefile.inc
Log Message:
Explicitly use -fcommon for globals shared between libc and CSU.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/csu/Makefile
cvs rdiff -u -r1.200 -r1.201 src/lib/libc/gen/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/misc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/Makefile
diff -u src/lib/csu/Makefile:1.39 src/lib/csu/Makefile:1.40
--- src/lib/csu/Makefile:1.39 Sun Jan 27 04:35:25 2019
+++ src/lib/csu/Makefile Wed Apr 22 23:32:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/01/27 04:35:25 dholland Exp $
+# $NetBSD: Makefile,v 1.40 2020/04/22 23:32:25 joerg Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -18,6 +18,8 @@ ARCHDIR:= ${.CURDIR}/arch/${CSU_MACHINE_
.error Architecture (${CSU_MACHINE_ARCH} or ${CSU_MACHINE_CPU}) unsupported
.endif
+# Ownership of globals from crt0.o is shared with libc for historic reasons
+COPTS+= -fcommon
.PATH: ${ARCHDIR}
.include "${ARCHDIR}/Makefile.inc"
Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.200 src/lib/libc/gen/Makefile.inc:1.201
--- src/lib/libc/gen/Makefile.inc:1.200 Sat Sep 9 18:18:28 2017
+++ src/lib/libc/gen/Makefile.inc Wed Apr 22 23:32:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.200 2017/09/09 18:18:28 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.201 2020/04/22 23:32:25 joerg Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
@@ -203,3 +203,7 @@ errlist.c: errlist.awk ${NETBSDSRCDIR}/s
${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET}
CLEANFILES+= errlist.c
+
+# Ownership of globals from crt0.o is shared with libc for historic reasons.
+# __progname is also necessary as global here for the nbcompat case.
+COPTS.getprogname.c+= -fcommon
Index: src/lib/libc/misc/Makefile.inc
diff -u src/lib/libc/misc/Makefile.inc:1.3 src/lib/libc/misc/Makefile.inc:1.4
--- src/lib/libc/misc/Makefile.inc:1.3 Fri Aug 3 04:29:35 2018
+++ src/lib/libc/misc/Makefile.inc Wed Apr 22 23:32:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2018/08/03 04:29:35 kamil Exp $
+# $NetBSD: Makefile.inc,v 1.4 2020/04/22 23:32:25 joerg Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
.PATH: ${ARCHDIR}/misc ${.CURDIR}/misc
@@ -13,3 +13,6 @@ SRCS+= initfini.c
# for -fstack-protector
SRCS+= stack_protector.c
+
+# Ownership of globals from crt0.o is shared with libc for historic reasons
+COPTS.initfini.c+= -fcommon
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Wed Apr 22 22:56:13 UTC 2020
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.1397 -r1.1398 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1396 -r1.1397 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1397 src/sys/dev/pci/pcidevs.h:1.1398
--- src/sys/dev/pci/pcidevs.h:1.1397 Wed Apr 22 11:40:27 2020
+++ src/sys/dev/pci/pcidevs.h Wed Apr 22 18:56:12 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1397 2020/04/22 15:40:27 prlw1 Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1398 2020/04/22 22:56:12 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1409 2020/04/22 06:35:58 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp
*/
/*
@@ -1300,6 +1300,7 @@
#define PCI_PRODUCT_AQUANTIA_AQC107 0x07b1 /* AQC107 10 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC108 0x08b1 /* AQC108 5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC109 0x09b1 /* AQC109 2.5 Gigabit Network Adapter */
+#define PCI_PRODUCT_AQUANTIA_AQC100 0x00b1 /* AQC100 10 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC111 0x11b1 /* AQC111 5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC112 0x12b1 /* AQC112 2.5 Gigabit Network Adapter */
#define PCI_PRODUCT_AQUANTIA_AQC100S 0x80b1 /* AQC100S 10 Gigabit Network Adapter */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1396 src/sys/dev/pci/pcidevs_data.h:1.1397
--- src/sys/dev/pci/pcidevs_data.h:1.1396 Wed Apr 22 11:40:27 2020
+++ src/sys/dev/pci/pcidevs_data.h Wed Apr 22 18:56:12 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1396 2020/04/22 15:40:27 prlw1 Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1397 2020/04/22 22:56:12 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1409 2020/04/22 06:35:58 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp
*/
/*
@@ -1754,6 +1754,8 @@ static const uint16_t pci_products[] = {
9051, 8083, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC109,
9058, 9065, 5669, 3888, 5869, 0,
+ PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC100,
+ 9034, 9041, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC111,
9069, 8083, 5669, 3888, 5869, 0,
PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC112,
@@ -14911,7 +14913,7 @@ static const char pci_words[] = { "."
"Pathlight\0" /* 1 refs @ 3860 */
"VideoTron\0" /* 1 refs @ 3870 */
"Pyramid\0" /* 1 refs @ 3880 */
- "Network\0" /* 70 refs @ 3888 */
+ "Network\0" /* 71 refs @ 3888 */
"Pinnacle\0" /* 1 refs @ 3896 */
"Microcircuts\0" /* 1 refs @ 3905 */
"Lucent\0" /* 1 refs @ 3918 */
@@ -15149,7 +15151,7 @@ static const char pci_words[] = { "."
"VENDOR\0" /* 1 refs @ 5653 */
"ID\0" /* 1 refs @ 5660 */
"3c985\0" /* 1 refs @ 5663 */
- "Gigabit\0" /* 142 refs @ 5669 */
+ "Gigabit\0" /* 143 refs @ 5669 */
"Ethernet\0" /* 530 refs @ 5677 */
"3c996\0" /* 1 refs @ 5686 */
"10/100/1000\0" /* 49 refs @ 5692 */
@@ -15174,7 +15176,7 @@ static const char pci_words[] = { "."
"3c595-T4\0" /* 1 refs @ 5838 */
"3c595-MII\0" /* 1 refs @ 5847 */
"3CRWE154G72\0" /* 1 refs @ 5857 */
- "Adapter\0" /* 93 refs @ 5869 */
+ "Adapter\0" /* 94 refs @ 5869 */
"3c556B\0" /* 1 refs @ 5877 */
"3CCFEM656\0" /* 2 refs @ 5884 */
"56k\0" /* 5 refs @ 5894 */
@@ -15604,8 +15606,8 @@ static const char pci_words[] = { "."
"U3\0" /* 6 refs @ 9015 */
"Shasta\0" /* 8 refs @ 9018 */
"FireWire\0" /* 2 refs @ 9025 */
- "AQC100\0" /* 1 refs @ 9034 */
- "10\0" /* 41 refs @ 9041 */
+ "AQC100\0" /* 2 refs @ 9034 */
+ "10\0" /* 42 refs @ 9041 */
"AQC107\0" /* 1 refs @ 9044 */
"AQC108\0" /* 1 refs @ 9051 */
"AQC109\0" /* 1 refs @ 9058 */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Wed Apr 22 22:54:44 UTC 2020
Modified Files:
src/sys/dev/pci: if_aq.c pcidevs
Log Message:
Add AQUANTIA AQC100 from Andrius V.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_aq.c
cvs rdiff -u -r1.1410 -r1.1411 src/sys/dev/pci/pcidevs
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_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.11 src/sys/dev/pci/if_aq.c:1.12
--- src/sys/dev/pci/if_aq.c:1.11 Sat Feb 15 07:20:35 2020
+++ src/sys/dev/pci/if_aq.c Wed Apr 22 18:54:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.11 2020/02/15 12:20:35 ryo Exp $ */
+/* $NetBSD: if_aq.c,v 1.12 2020/04/22 22:54:43 christos Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.11 2020/02/15 12:20:35 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.12 2020/04/22 22:54:43 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -1154,6 +1154,10 @@ static const struct aq_product {
"Aquantia AQC109 2.5 Gigabit Network Adapter",
AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5
},
+{ PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC100,
+ "Aquantia AQC100 10 Gigabit Network Adapter",
+ AQ_MEDIA_TYPE_FIBRE, AQ_LINK_ALL
+},
{ PCI_VENDOR_AQUANTIA, PCI_PRODUCT_AQUANTIA_AQC111,
"Aquantia AQC111 5 Gigabit Network Adapter",
AQ_MEDIA_TYPE_TP, AQ_LINK_100M | AQ_LINK_1G | AQ_LINK_2G5 | AQ_LINK_5G
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1410 src/sys/dev/pci/pcidevs:1.1411
--- src/sys/dev/pci/pcidevs:1.1410 Wed Apr 22 11:39:59 2020
+++ src/sys/dev/pci/pcidevs Wed Apr 22 18:54:43 2020
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1410 2020/04/22 15:39:59 prlw1 Exp $
+$NetBSD: pcidevs,v 1.1411 2020/04/22 22:54:43 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1293,6 +1293,7 @@ product AQUANTIA AQC100 0x00b1 AQC100 1
product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter
product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter
product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter
+product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter
product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter
product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter
product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Wed Apr 22 21:35:52 UTC 2020
Modified Files:
src/sys/kern: vfs_cache.c vfs_lookup.c
Log Message:
lookup_fastforward(): handle dotdot lookups and give up less often in
the union mount case.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/kern/vfs_cache.c
cvs rdiff -u -r1.218 -r1.219 src/sys/kern/vfs_lookup.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/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.139 src/sys/kern/vfs_cache.c:1.140
--- src/sys/kern/vfs_cache.c:1.139 Mon Apr 13 19:23:18 2020
+++ src/sys/kern/vfs_cache.c Wed Apr 22 21:35:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.139 2020/04/13 19:23:18 ad Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.140 2020/04/22 21:35:52 ad Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -172,7 +172,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.139 2020/04/13 19:23:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.140 2020/04/22 21:35:52 ad Exp $");
#define __NAMECACHE_PRIVATE
#ifdef _KERNEL_OPT
@@ -664,10 +664,17 @@ cache_lookup_linked(struct vnode *dvp, c
* before we get its lock.
*
* Note that the two locks can be the same if looking up a dot, for
- * example: /usr/bin/.
+ * example: /usr/bin/. If looking up the parent (..) we can't wait
+ * on the lock as child -> parent is the wrong direction.
*/
if (*plock != >vi_nc_lock) {
- rw_enter(>vi_nc_lock, RW_READER);
+ if (namelen == 2 && name[0] == '.' && name[1] == '.') {
+ if (!rw_tryenter(>vi_nc_lock, RW_READER)) {
+return false;
+ }
+ } else {
+ rw_enter(>vi_nc_lock, RW_READER);
+ }
if (*plock != NULL) {
rw_exit(*plock);
}
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.218 src/sys/kern/vfs_lookup.c:1.219
--- src/sys/kern/vfs_lookup.c:1.218 Tue Apr 21 21:42:47 2020
+++ src/sys/kern/vfs_lookup.c Wed Apr 22 21:35:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.218 2020/04/21 21:42:47 ad Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.219 2020/04/22 21:35:52 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.218 2020/04/21 21:42:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.219 2020/04/22 21:35:52 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1286,14 +1286,19 @@ lookup_fastforward(struct namei_state *s
}
/*
- * Can't deal with dotdot lookups, because it means lock
- * order reversal, and there are checks in lookup_once()
- * that need to be made. Also check for missing mountpoints.
+ * Can't deal with DOTDOT lookups if NOCROSSMOUNT or the
+ * lookup is chrooted.
*/
- if ((cnp->cn_flags & ISDOTDOT) != 0 ||
- searchdir->v_mount == NULL) {
- error = EOPNOTSUPP;
- break;
+ if ((cnp->cn_flags & ISDOTDOT) != 0) {
+ if ((searchdir->v_vflag & VV_ROOT) != 0 &&
+ (cnp->cn_flags & NOCROSSMOUNT)) {
+ error = EOPNOTSUPP;
+break;
+ }
+ if (ndp->ni_rootdir != rootvnode) {
+ error = EOPNOTSUPP;
+break;
+ }
}
/*
@@ -1309,13 +1314,6 @@ lookup_fastforward(struct namei_state *s
}
}
- /* Can't deal with -o union lookups. */
- if ((searchdir->v_vflag & VV_ROOT) != 0 &&
- (searchdir->v_mount->mnt_flag & MNT_UNION) != 0) {
- error = EOPNOTSUPP;
- break;
- }
-
/*
* Good, now look for it in cache. cache_lookup_linked()
* will fail if there's nothing there, or if there's no
@@ -1329,9 +1327,18 @@ lookup_fastforward(struct namei_state *s
}
KASSERT(plock != NULL && rw_lock_held(plock));
- /* Scored a hit. Negative is good too (ENOENT). */
+ /*
+ * Scored a hit. Negative is good too (ENOENT). If there's
+ * a '-o union' mount here, punt and let lookup_once() deal
+ * with it.
+ */
if (foundobj == NULL) {
- error = ENOENT;
+ if ((searchdir->v_vflag & VV_ROOT) != 0 &&
+ (searchdir->v_mount->mnt_flag & MNT_UNION) != 0) {
+ error = EOPNOTSUPP;
+ } else {
+error = ENOENT;
+ }
break;
}
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: thorpej Date: Wed Apr 22 21:28:03 UTC 2020 Removed Files: src/tests/lib/libc/sys: t_lwp_tid.c Log Message: Remove unit tests for the never-exposed _lwp_gettid(2). To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/sys/t_lwp_tid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: thorpej Date: Wed Apr 22 21:27:06 UTC 2020 Removed Files: src/lib/libc/sys: _lwp_gettid.2 Log Message: Remove man page for the never-exposed _lwp_gettid(2) call. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/lib/libc/sys/_lwp_gettid.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Wed Apr 22 21:25:18 UTC 2020 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: Regen for removal of _lwp_gettid(2). To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.150 -r1.151 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.30 -r1.31 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.149 -r1.150 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_systrace_args.c cvs rdiff -u -r1.328 -r1.329 src/sys/kern/init_sysent.c cvs rdiff -u -r1.316 -r1.317 src/sys/kern/syscalls.c cvs rdiff -u -r1.33 -r1.34 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.35 -r1.36 src/sys/kern/systrace_args.c cvs rdiff -u -r1.114 -r1.115 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.145 -r1.146 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.310 -r1.311 src/sys/sys/syscall.h cvs rdiff -u -r1.294 -r1.295 src/sys/sys/syscallargs.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/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.151 src/sys/compat/netbsd32/netbsd32_syscall.h:1.152 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.151 Sat Apr 4 20:27:27 2020 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Apr 22 21:25:17 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.151 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.152 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -875,9 +875,6 @@ /* syscall: "netbsd32__lwp_ctl" ret: "int" args: "int" "netbsd32_pointer_t" */ #define NETBSD32_SYS_netbsd32__lwp_ctl 325 -/* syscall: "_lwp_gettid" ret: "lwptid_t" args: */ -#define NETBSD32_SYS__lwp_gettid 326 - /* 330 is obsolete netbsd32_sa_register */ /* 331 is obsolete netbsd32_sa_stacks */ /* 332 is obsolete sa_enable */ Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.150 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.151 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.150 Sat Apr 4 20:27:27 2020 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Apr 22 21:25:17 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.150 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.151 2020/04/22 21:25:17 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -3214,8 +3214,6 @@ int netbsd32__lwp_getname(struct lwp *, int netbsd32__lwp_ctl(struct lwp *, const struct netbsd32__lwp_ctl_args *, register_t *); -int sys__lwp_gettid(struct lwp *, const void *, register_t *); - int netbsd32___sigaction_sigtramp(struct lwp *, const struct netbsd32___sigaction_sigtramp_args *, register_t *); int netbsd32_rasctl(struct lwp *, const struct netbsd32_rasctl_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.150 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.151 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.150 Sat Apr 4 20:27:27 2020 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Apr 22 21:25:18 2020 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.150 2020/04/04 20:27:27 thorpej Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp + * created from NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.150 2020/04/04 20:27:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $"); #if
CVS commit: src/sys
Module Name:src
Committed By: thorpej
Date: Wed Apr 22 21:22:21 UTC 2020
Modified Files:
src/sys/compat/netbsd32: syscalls.master
src/sys/kern: sys_lwp.c syscalls.master
Log Message:
Remove _lwp_gettid(2) system call. This problem is going to be solved
another way. (Note: this call was never exposed in libc, so we can just
recycle the syscall number.)
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.77 -r1.78 src/sys/kern/sys_lwp.c
cvs rdiff -u -r1.301 -r1.302 src/sys/kern/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.134 src/sys/compat/netbsd32/syscalls.master:1.135
--- src/sys/compat/netbsd32/syscalls.master:1.134 Sat Apr 4 20:20:12 2020
+++ src/sys/compat/netbsd32/syscalls.master Wed Apr 22 21:22:21 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.134 2020/04/04 20:20:12 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -747,7 +747,7 @@
netbsd32_charp name, netbsd32_size_t len); }
325 STD { int|netbsd32||_lwp_ctl(int features, \
netbsd32_pointer_t address); }
-326 NOARGS { lwptid_t|sys||_lwp_gettid(void); }
+326 UNIMPL
327 UNIMPL
328 UNIMPL
329 UNIMPL
Index: src/sys/kern/sys_lwp.c
diff -u src/sys/kern/sys_lwp.c:1.77 src/sys/kern/sys_lwp.c:1.78
--- src/sys/kern/sys_lwp.c:1.77 Sun Apr 19 20:35:29 2020
+++ src/sys/kern/sys_lwp.c Wed Apr 22 21:22:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_lwp.c,v 1.77 2020/04/19 20:35:29 ad Exp $ */
+/* $NetBSD: sys_lwp.c,v 1.78 2020/04/22 21:22:21 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.77 2020/04/19 20:35:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.78 2020/04/22 21:22:21 thorpej Exp $");
#include
#include
@@ -175,14 +175,6 @@ sys__lwp_self(struct lwp *l, const void
}
int
-sys__lwp_gettid(struct lwp *l, const void *v, register_t *retval)
-{
-
- *retval = lwp_gettid();
- return 0;
-}
-
-int
sys__lwp_getprivate(struct lwp *l, const void *v, register_t *retval)
{
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.301 src/sys/kern/syscalls.master:1.302
--- src/sys/kern/syscalls.master:1.301 Sun Apr 12 22:06:17 2020
+++ src/sys/kern/syscalls.master Wed Apr 22 21:22:21 2020
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.301 2020/04/12 22:06:17 christos Exp $
+ $NetBSD: syscalls.master,v 1.302 2020/04/22 21:22:21 thorpej Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -661,8 +661,8 @@
char *name, size_t len); }
325 STD { int|sys||_lwp_ctl(int features, \
struct lwpctl **address); }
-326 STD { lwptid_t|sys||_lwp_gettid(void); }
-; Syscalls 327-339 reserved for LWP syscalls.
+; Syscalls 326-339 reserved for LWP syscalls.
+326 UNIMPL
327 UNIMPL
328 UNIMPL
329 UNIMPL
CVS commit: [bouyer-xenpvh] src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Wed Apr 22 20:49:08 UTC 2020
Modified Files:
src/sys/arch/xen/xen [bouyer-xenpvh]: hypervisor.c
Log Message:
Don't try to attach vcpu on !XENPV
remove debug printf and other misc cosmetic changes
To generate a diff of this commit:
cvs rdiff -u -r1.73.2.8 -r1.73.2.9 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.73.2.8 src/sys/arch/xen/xen/hypervisor.c:1.73.2.9
--- src/sys/arch/xen/xen/hypervisor.c:1.73.2.8 Mon Apr 20 11:29:01 2020
+++ src/sys/arch/xen/xen/hypervisor.c Wed Apr 22 20:49:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.73.2.8 2020/04/20 11:29:01 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.73.2.9 2020/04/22 20:49:08 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.8 2020/04/20 11:29:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.9 2020/04/22 20:49:08 bouyer Exp $");
#include
#include
@@ -399,8 +399,6 @@ xen_hvm_init_cpu(struct cpu_info *ci)
vm_guest = VM_GUEST_XENHVM;
return 0;
}
- printf("cpu %s ci_acpiid %d vcpuid %d domid %d\n",
- device_xname(ci->ci_dev), ci->ci_acpiid, descs[1], descs[2]);
ci->ci_vcpuid = descs[1];
ci->ci_vcpu = _shared_info->vcpu_info[ci->ci_vcpuid];
@@ -434,9 +432,9 @@ xen_hvm_init_cpu(struct cpu_info *ci)
* From FreeBSD:
* Trick toolstack to think we are enlightened
*/
+ xen_hvm_param.value = 1;
aprint_verbose_dev(ci->ci_dev,
"using event upcall vector: %d\n", xen_hvm_vec );
- xen_hvm_param.value = 1;
}
}
@@ -476,14 +474,14 @@ hypervisor_match(device_t parent, cfdata
return 1;
}
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) && defined(XENPV)
static int
hypervisor_vcpu_print(void *aux, const char *parent)
{
/* Unconfigured cpus are ignored quietly. */
return (QUIET);
}
-#endif /* MULTIPROCESSOR */
+#endif /* MULTIPROCESSOR && XENPV */
/*
* Attach the hypervisor.
@@ -591,6 +589,7 @@ hypervisor_attach(device_t parent, devic
xengnt_init();
events_init();
+#ifdef XENPV
memset(, 0, sizeof(hac));
hac.hac_vcaa.vcaa_name = "vcpu";
hac.hac_vcaa.vcaa_caa.cpu_number = 0;
@@ -622,6 +621,7 @@ hypervisor_attach(device_t parent, devic
}
#endif /* MULTIPROCESSOR */
+#endif /* XENPV */
#if NXENBUS > 0
extern struct x86_bus_dma_tag xenbus_bus_dma_tag;
CVS commit: src/sys/netinet6
Module Name:src
Committed By: roy
Date: Wed Apr 22 19:32:11 UTC 2020
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
inet6: nd6_na_input() now considers ln_state <= ND6_LLINFO_INCOMPLETE
Otherwise if ln_state != ND6_LLINFO_INCOMPLETE and the is no lladdr
and this message was solicited then ln_state is set to ND6_LLINFO_REACHABLE
which could then cause a panic in nd6_resolve().
If ln_state > ND6_LLINFO_INCOMPLETE then it's assumed we have a lladdr.
Potentially this could have been triggered by the introduction of
ND6_LLINFO_PURGE in nd6.c r1.143 but also by the re-introduction of
ND6_LLINFO_INCOMPLETE in nd6.c r1.263.
Depending on the timing, it's technically possible to receive such
a message after the llentry is created with ND6_LLINFO_NOSTATE.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/netinet6/nd6_nbr.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_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.177 src/sys/netinet6/nd6_nbr.c:1.178
--- src/sys/netinet6/nd6_nbr.c:1.177 Mon Mar 9 21:20:56 2020
+++ src/sys/netinet6/nd6_nbr.c Wed Apr 22 19:32:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.177 2020/03/09 21:20:56 roy Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.178 2020/04/22 19:32:11 roy Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.177 2020/03/09 21:20:56 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.178 2020/04/22 19:32:11 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -735,7 +735,7 @@ nd6_na_input(struct mbuf *m, int off, in
goto freeit;
rt_cmd = 0;
- if (ln->ln_state == ND6_LLINFO_INCOMPLETE) {
+ if (ln->ln_state <= ND6_LLINFO_INCOMPLETE) {
/*
* If the link-layer has address, and no lladdr option came,
* discard the packet.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Apr 22 18:26:06 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Ticket #843 To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 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.38 src/doc/CHANGES-9.1:1.1.2.39 --- src/doc/CHANGES-9.1:1.1.2.38 Wed Apr 22 18:22:23 2020 +++ src/doc/CHANGES-9.1 Wed Apr 22 18:26:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.38 2020/04/22 18:22:23 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.39 2020/04/22 18:26:06 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -980,3 +980,8 @@ sys/compat/ossaudio/ossaudio.c 1.83 ossaudio: Avoid giving userland uninitialized memory. [maxv, ticket #841] +external/gpl3/gcc/lib/libsupc++/Makefile 1.13 + + PR 54660: pull in atomicity.h (atomicity.cc) on sparc. + [mrg, ticket #843] +
CVS commit: [netbsd-9] src/external/gpl3/gcc/lib/libsupc++
Module Name:src
Committed By: martin
Date: Wed Apr 22 18:25:10 UTC 2020
Modified Files:
src/external/gpl3/gcc/lib/libsupc++ [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #843):
external/gpl3/gcc/lib/libsupc++/Makefile: revision 1.13
pull in atomicity.h (atomicity.cc) on sparc. 3 of the objects
use these interfaces and this avoids link errors
fixes PR#54660.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.2.1 src/external/gpl3/gcc/lib/libsupc++/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/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.12 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.12.2.1
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.12 Sat Jan 19 17:11:02 2019
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Wed Apr 22 18:25:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/01/19 17:11:02 mrg Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2020/04/22 18:25:10 martin Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -25,6 +25,15 @@ SHLIB_MINOR= 0
SRCS= ${LIBSUPCXXSRCS} xmalloc.c
CXXFLAGS+= ${G_SECTION_FLAGS}
+# XXX PR#54660
+.if ${MACHINE} == "sparc"
+SRCS+= atomicity.cc
+DIST= ${GCCDIST}
+GLIBCXX_SRCDIR= ${DIST}/libstdc++-v3
+BUILDSYMLINKS+= \
+ ${GLIBCXX_SRCDIR}/${G_ATOMICITY_SRCDIR}/atomicity.h atomicity.cc
+.endif
+
COPTS.cp-demangle.c = -Wno-stack-protector -Wno-unused-function
.include "../Makefile.gthr"
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Apr 22 18:22:24 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #837 - #841 To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 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.37 src/doc/CHANGES-9.1:1.1.2.38 --- src/doc/CHANGES-9.1:1.1.2.37 Thu Apr 16 14:03:24 2020 +++ src/doc/CHANGES-9.1 Wed Apr 22 18:22:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.37 2020/04/16 14:03:24 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.38 2020/04/22 18:22:23 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -950,3 +950,33 @@ sys/dev/pci/machfb.c1.98 switch modes only when actually necessary. [jdc, ticket #836] +sys/arch/macppc/stand/ofwboot/Locore.c 1.34 +sys/arch/powerpc/oea/ofw_consinit.c 1.18 + + Fix booting with auto-boot == true on some macppc machines. + [rin, ticket #837] + +etc/rc.d/network1.78 (plus patch) +share/man/man5/ifconfig.if.5 1.20 +usr.sbin/rtsold/rtsold.8 1.42 + + Add an "rtsol" keyword to ifconfig.if for enabling IPv6 RS/RA. + [kim, ticket #838] + +sys/kern/vfs_mount.c1.79 + + PR kern/54969: destroy anonymous device vnodes on reboot once the + last file system got unmounted and the mount list is empty. + [gson, ticket #839] + +lib/libc/sys/fdatasync.2 1.17 +sys/kern/vfs_syscalls.c1.544 + + Allow fdatasync on non-writable fds (POSIX conformance fix). + [gdt, ticket #840] + +sys/compat/ossaudio/ossaudio.c 1.83 + + ossaudio: Avoid giving userland uninitialized memory. + [maxv, ticket #841] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 22 18:21:41 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1533 - #1535 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.2 src/doc/CHANGES-8.3:1.1.2.3 --- src/doc/CHANGES-8.3:1.1.2.2 Wed Apr 15 14:46:38 2020 +++ src/doc/CHANGES-8.3 Wed Apr 22 18:21:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.2 2020/04/15 14:46:38 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.3 2020/04/22 18:21:41 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -64,3 +64,20 @@ sys/dev/wsfb/genfb.c1.72 Get genfb's address offset correctly when the value >= 4G. [msaitoh, ticket #1532] +sys/arch/macppc/stand/ofwboot/Locore.c 1.34 (via patch) +sys/arch/powerpc/oea/ofw_consinit.c 1.18 + + Fix booting with auto-boot == true on some macppc machines. + [rin, ticket #1533] + +lib/libc/sys/fdatasync.2 1.17 +sys/kern/vfs_syscalls.c1.544 + + Allow fdatasync on non-writable fds (POSIX conformance fix). + [gdt, ticket #1534] + +sys/compat/ossaudio/ossaudio.c 1.83 + + ossaudio: Avoid giving userland uninitialized memory. + [maxv, ticket #1535] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Wed Apr 22 18:18:26 UTC 2020
Modified Files:
src/lib/libc/sys [netbsd-8]: fdatasync.2
src/sys/kern [netbsd-8]: vfs_syscalls.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #1534):
sys/kern/vfs_syscalls.c: revision 1.544
lib/libc/sys/fdatasync.2: revision 1.17
Relax fdatasync restriction that fd be writable
The restriction that a fd passed to fdatasync(2) must be writable was
added in 2003 in order to comply with POSIX. Since then, POSIX has
removed that requirement, and POSIX-valid programs have been therefore
encountering errors on NetBSD.
Patch by Paul Ripke after discussion on netbsd-users. Issue
discovered with pkgsrc/databases/mongodb3 as used by pkgsrc/net/unifi.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.56.1 src/lib/libc/sys/fdatasync.2
cvs rdiff -u -r1.516 -r1.516.2.1 src/sys/kern/vfs_syscalls.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/libc/sys/fdatasync.2
diff -u src/lib/libc/sys/fdatasync.2:1.16 src/lib/libc/sys/fdatasync.2:1.16.56.1
--- src/lib/libc/sys/fdatasync.2:1.16 Wed Apr 30 13:10:51 2008
+++ src/lib/libc/sys/fdatasync.2 Wed Apr 22 18:18:26 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: fdatasync.2,v 1.16 2008/04/30 13:10:51 martin Exp $
+.\" $NetBSD: fdatasync.2,v 1.16.56.1 2020/04/22 18:18:26 martin Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -68,7 +68,7 @@ function will fail if:
.It Bq Er EBADF
The
.Fa fd
-argument is not a valid file descriptor open for writing.
+argument is not a valid file descriptor.
.It Bq Er EINVAL
This implementation does not support synchronized I/O for this file.
.It Bq Er ENOSYS
@@ -93,4 +93,4 @@ and outstanding I/O operations are not g
The
.Fn fdatasync
function conforms to
-.St -p1003.1b-93 .
+.St -p1003.1-2008 .
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.516 src/sys/kern/vfs_syscalls.c:1.516.2.1
--- src/sys/kern/vfs_syscalls.c:1.516 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/vfs_syscalls.c Wed Apr 22 18:18:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.516 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.516.2.1 2020/04/22 18:18:26 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.516 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.516.2.1 2020/04/22 18:18:26 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -4004,8 +4004,7 @@ sys_fsync(struct lwp *l, const struct sy
* Sync a range of file data. API modeled after that found in AIX.
*
* FDATASYNC indicates that we need only save enough metadata to be able
- * to re-read the written data. Note we duplicate AIX's requirement that
- * the file be open for writing.
+ * to re-read the written data.
*/
/* ARGSUSED */
int
@@ -4086,10 +4085,6 @@ sys_fdatasync(struct lwp *l, const struc
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), )) != 0)
return (error);
- if ((fp->f_flag & FWRITE) == 0) {
- fd_putfile(SCARG(uap, fd));
- return (EBADF);
- }
vp = fp->f_vnode;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
error = VOP_FSYNC(vp, fp->f_cred, FSYNC_WAIT|FSYNC_DATAONLY, 0, 0);
CVS commit: [netbsd-8] src/sys/compat/ossaudio
Module Name:src Committed By: martin Date: Wed Apr 22 18:15:12 UTC 2020 Modified Files: src/sys/compat/ossaudio [netbsd-8]: ossaudio.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1535): sys/compat/ossaudio/ossaudio.c: revision 1.83 ossaudio: Avoid giving userland uninitialized memory. Noticed by maxv. The uninitalized field in this structure is `fillers`, an array that simply reserves space for later changes in OSSv4, which this version of the OSS compat layer (specifically for Linux applications) makes no effort to implement. To generate a diff of this commit: cvs rdiff -u -r1.70.6.2 -r1.70.6.3 src/sys/compat/ossaudio/ossaudio.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/ossaudio/ossaudio.c diff -u src/sys/compat/ossaudio/ossaudio.c:1.70.6.2 src/sys/compat/ossaudio/ossaudio.c:1.70.6.3 --- src/sys/compat/ossaudio/ossaudio.c:1.70.6.2 Tue Jan 21 18:12:54 2020 +++ src/sys/compat/ossaudio/ossaudio.c Wed Apr 22 18:15:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ossaudio.c,v 1.70.6.2 2020/01/21 18:12:54 martin Exp $ */ +/* $NetBSD: ossaudio.c,v 1.70.6.3 2020/04/22 18:15:12 martin Exp $ */ /*- * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70.6.2 2020/01/21 18:12:54 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70.6.3 2020/04/22 18:15:12 martin Exp $"); #include #include @@ -1075,6 +1075,7 @@ oss_ioctl_mixer(struct lwp *lwp, const s __func__, error)); goto out; } + memset(, 0, sizeof omi); omi.modify_counter = 1; strncpy(omi.id, adev.name, sizeof omi.id); strncpy(omi.name, adev.name, sizeof omi.name);
CVS commit: [netbsd-9] src/sys/compat/ossaudio
Module Name:src Committed By: martin Date: Wed Apr 22 18:12:26 UTC 2020 Modified Files: src/sys/compat/ossaudio [netbsd-9]: ossaudio.c Log Message: Pull up following revision(s) (requested by maxv in ticket #841): sys/compat/ossaudio/ossaudio.c: revision 1.83 ossaudio: Avoid giving userland uninitialized memory. Noticed by maxv. The uninitalized field in this structure is `fillers`, an array that simply reserves space for later changes in OSSv4, which this version of the OSS compat layer (specifically for Linux applications) makes no effort to implement. To generate a diff of this commit: cvs rdiff -u -r1.74.4.2 -r1.74.4.3 src/sys/compat/ossaudio/ossaudio.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/ossaudio/ossaudio.c diff -u src/sys/compat/ossaudio/ossaudio.c:1.74.4.2 src/sys/compat/ossaudio/ossaudio.c:1.74.4.3 --- src/sys/compat/ossaudio/ossaudio.c:1.74.4.2 Tue Nov 19 11:01:27 2019 +++ src/sys/compat/ossaudio/ossaudio.c Wed Apr 22 18:12:26 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ossaudio.c,v 1.74.4.2 2019/11/19 11:01:27 martin Exp $ */ +/* $NetBSD: ossaudio.c,v 1.74.4.3 2020/04/22 18:12:26 martin Exp $ */ /*- * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.74.4.2 2019/11/19 11:01:27 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.74.4.3 2020/04/22 18:12:26 martin Exp $"); #include #include @@ -1084,6 +1084,7 @@ oss_ioctl_mixer(struct lwp *lwp, const s __func__, error)); goto out; } + memset(, 0, sizeof omi); omi.modify_counter = 1; strncpy(omi.id, adev.name, sizeof omi.id); strncpy(omi.name, adev.name, sizeof omi.name);
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Wed Apr 22 18:07:37 UTC 2020
Modified Files:
src/lib/libc/sys [netbsd-9]: fdatasync.2
src/sys/kern [netbsd-9]: vfs_syscalls.c
Log Message:
Pull up following revision(s) (requested by gdt in ticket #840):
sys/kern/vfs_syscalls.c: revision 1.544
lib/libc/sys/fdatasync.2: revision 1.17
Relax fdatasync restriction that fd be writable
The restriction that a fd passed to fdatasync(2) must be writable was
added in 2003 in order to comply with POSIX. Since then, POSIX has
removed that requirement, and POSIX-valid programs have been therefore
encountering errors on NetBSD.
Patch by Paul Ripke after discussion on netbsd-users. Issue
discovered with pkgsrc/databases/mongodb3 as used by pkgsrc/net/unifi.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.66.1 src/lib/libc/sys/fdatasync.2
cvs rdiff -u -r1.533 -r1.533.2.1 src/sys/kern/vfs_syscalls.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/libc/sys/fdatasync.2
diff -u src/lib/libc/sys/fdatasync.2:1.16 src/lib/libc/sys/fdatasync.2:1.16.66.1
--- src/lib/libc/sys/fdatasync.2:1.16 Wed Apr 30 13:10:51 2008
+++ src/lib/libc/sys/fdatasync.2 Wed Apr 22 18:07:37 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: fdatasync.2,v 1.16 2008/04/30 13:10:51 martin Exp $
+.\" $NetBSD: fdatasync.2,v 1.16.66.1 2020/04/22 18:07:37 martin Exp $
.\"
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -68,7 +68,7 @@ function will fail if:
.It Bq Er EBADF
The
.Fa fd
-argument is not a valid file descriptor open for writing.
+argument is not a valid file descriptor.
.It Bq Er EINVAL
This implementation does not support synchronized I/O for this file.
.It Bq Er ENOSYS
@@ -93,4 +93,4 @@ and outstanding I/O operations are not g
The
.Fn fdatasync
function conforms to
-.St -p1003.1b-93 .
+.St -p1003.1-2008 .
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.533 src/sys/kern/vfs_syscalls.c:1.533.2.1
--- src/sys/kern/vfs_syscalls.c:1.533 Sat Jul 6 14:37:24 2019
+++ src/sys/kern/vfs_syscalls.c Wed Apr 22 18:07:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.533 2019/07/06 14:37:24 maxv Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.533.2.1 2020/04/22 18:07:37 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.533 2019/07/06 14:37:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.533.2.1 2020/04/22 18:07:37 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -4044,8 +4044,7 @@ sys_fsync(struct lwp *l, const struct sy
* Sync a range of file data. API modeled after that found in AIX.
*
* FDATASYNC indicates that we need only save enough metadata to be able
- * to re-read the written data. Note we duplicate AIX's requirement that
- * the file be open for writing.
+ * to re-read the written data.
*/
/* ARGSUSED */
int
@@ -4126,10 +4125,6 @@ sys_fdatasync(struct lwp *l, const struc
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), )) != 0)
return (error);
- if ((fp->f_flag & FWRITE) == 0) {
- fd_putfile(SCARG(uap, fd));
- return (EBADF);
- }
vp = fp->f_vnode;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
error = VOP_FSYNC(vp, fp->f_cred, FSYNC_WAIT|FSYNC_DATAONLY, 0, 0);
CVS commit: [netbsd-9] src/sys/kern
Module Name:src
Committed By: martin
Date: Wed Apr 22 18:05:11 UTC 2020
Modified Files:
src/sys/kern [netbsd-9]: vfs_mount.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #839):
sys/kern/vfs_mount.c: revision 1.79
Destroy anonymous device vnodes on reboot once the last file system
got unmounted and the mount list is empty.
PR kern/54969: Disk cache is no longer flushed on shutdown
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.70.4.1 src/sys/kern/vfs_mount.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/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.70 src/sys/kern/vfs_mount.c:1.70.4.1
--- src/sys/kern/vfs_mount.c:1.70 Wed Feb 20 10:08:37 2019
+++ src/sys/kern/vfs_mount.c Wed Apr 22 18:05:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.70 2019/02/20 10:08:37 hannken Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.70.4.1 2020/04/22 18:05:11 martin Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.70 2019/02/20 10:08:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.70.4.1 2020/04/22 18:05:11 martin Exp $");
#include
#include
@@ -114,6 +114,8 @@ static struct vnode *vfs_vnode_iterator_
/* Root filesystem. */
vnode_t * rootvnode;
+extern struct mount *dead_rootmount;
+
/* Mounted filesystem list. */
static TAILQ_HEAD(mountlist, mountlist_entry) mountlist;
static kmutex_t mountlist_lock;
@@ -1000,6 +1002,7 @@ bool
vfs_unmountall1(struct lwp *l, bool force, bool verbose)
{
struct mount *mp;
+ mount_iterator_t *iter;
bool any_error = false, progress = false;
uint64_t gen;
int error;
@@ -1034,6 +1037,24 @@ vfs_unmountall1(struct lwp *l, bool forc
if (any_error && verbose) {
printf("WARNING: some file systems would not unmount\n");
}
+
+ /* If the mountlist is empty destroy anonymous device vnodes. */
+ mountlist_iterator_init();
+ if (mountlist_iterator_next(iter) == NULL) {
+ struct vnode_iterator *marker;
+ vnode_t *vp;
+
+ vfs_vnode_iterator_init(dead_rootmount, );
+ while ((vp = vfs_vnode_iterator_next(marker, NULL, NULL))) {
+ if (vp->v_type == VCHR || vp->v_type == VBLK)
+vgone(vp);
+ else
+vrele(vp);
+ }
+ vfs_vnode_iterator_destroy(marker);
+ }
+ mountlist_iterator_destroy(iter);
+
return progress;
}
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Wed Apr 22 17:55:16 UTC 2020
Modified Files:
src/etc/rc.d [netbsd-9]: network
src/share/man/man5 [netbsd-9]: ifconfig.if.5
src/usr.sbin/rtsold [netbsd-9]: rtsold.8
Log Message:
Pull up following revision(s) (requested by kim in ticket #838):
share/man/man5/ifconfig.if.5: revision 1.20
etc/rc.d/network: revision 1.78 (plus patch)
usr.sbin/rtsold/rtsold.8: revision 1.42
Add an "rtsol" keyword to ifconfig.if for enabling IPv6 RS/RA
Sort SEE ALSO.
Update date
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.76.2.1 src/etc/rc.d/network
cvs rdiff -u -r1.18 -r1.18.18.1 src/share/man/man5/ifconfig.if.5
cvs rdiff -u -r1.37 -r1.37.6.1 src/usr.sbin/rtsold/rtsold.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.76 src/etc/rc.d/network:1.76.2.1
--- src/etc/rc.d/network:1.76 Tue Oct 23 09:25:33 2018
+++ src/etc/rc.d/network Wed Apr 22 17:55:16 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.76 2018/10/23 09:25:33 mrg Exp $
+# $NetBSD: network,v 1.76.2.1 2020/04/22 17:55:16 martin Exp $
#
# PROVIDE: network
@@ -215,7 +215,8 @@ network_start_interfaces()
# For each line from the $ifconfig_xxN variable or the
# /etc/ifconfig.xxN file, we ignore comments and blank lines,
# treat lines beginning with "!" as commands to execute, treat
- # "dhcp" as a special case to invoke dhcpcd, and for any other
+ # "dhcp" as a special case to invoke dhcpcd, treat "rtsol" as
+ # a special case to send a router solicitation, and for any other
# line we run "ifconfig xxN", using each line of the file as the
# arguments for a separate "ifconfig" invocation.
#
@@ -322,6 +323,14 @@ network_start_interfaces()
${dhcpcd_flags} $int
fi
;;
+ rtsol)
+if ! checkyesno dhcpcd; then
+ /sbin/sysctl -qw \
+ net.inet6.ip6.accept_rtadv=1
+ /sbin/dhcpcd -q6T --nodhcp6 $int \
+ >/dev/null
+fi
+;;
*)
# Pass args to ifconfig. Note
# that args may contain embedded
Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.18 src/share/man/man5/ifconfig.if.5:1.18.18.1
--- src/share/man/man5/ifconfig.if.5:1.18 Mon Dec 29 14:22:25 2014
+++ src/share/man/man5/ifconfig.if.5 Wed Apr 22 17:55:16 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.if.5,v 1.18 2014/12/29 14:22:25 wiz Exp $
+.\" $NetBSD: ifconfig.if.5,v 1.18.18.1 2020/04/22 17:55:16 martin Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 18, 2014
+.Dd April 15, 2020
.Dt IFCONFIG.IF 5
.Os
.Sh NAME
Index: src/usr.sbin/rtsold/rtsold.8
diff -u src/usr.sbin/rtsold/rtsold.8:1.37 src/usr.sbin/rtsold/rtsold.8:1.37.6.1
--- src/usr.sbin/rtsold/rtsold.8:1.37 Sun Oct 22 18:09:33 2017
+++ src/usr.sbin/rtsold/rtsold.8 Wed Apr 22 17:55:16 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: rtsold.8,v 1.37 2017/10/22 18:09:33 abhinav Exp $
+.\" $NetBSD: rtsold.8,v 1.37.6.1 2020/04/22 17:55:16 martin Exp $
.\" $KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 12, 2014
+.Dd April 15, 2020
.Dt RTSOLD 8
.Os
.\"
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:57:58 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add troyounce To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/units/units.lib 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/units/units.lib diff -u src/usr.bin/units/units.lib:1.22 src/usr.bin/units/units.lib:1.23 --- src/usr.bin/units/units.lib:1.22 Wed Apr 22 16:35:47 2020 +++ src/usr.bin/units/units.lib Wed Apr 22 16:57:57 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.22 2020/04/22 16:35:47 scole Exp $ +/ $NetBSD: units.lib,v 1.23 2020/04/22 16:57:57 scole Exp $ / primitive units @@ -136,6 +136,7 @@ apdram 60 grain apounce 480 grain appound 5760 grain troypound appound +troyounce 1|12 troypound / Length
CVS commit: [bouyer-xenpvh] src/sys/arch/amd64/conf
Module Name:src Committed By: bouyer Date: Wed Apr 22 16:51:56 UTC 2020 Modified Files: src/sys/arch/amd64/conf [bouyer-xenpvh]: XEN3_DOMU Log Message: Remove HZ=20, it was to testing only. To generate a diff of this commit: cvs rdiff -u -r1.90.6.3 -r1.90.6.4 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.90.6.3 src/sys/arch/amd64/conf/XEN3_DOMU:1.90.6.4 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.90.6.3 Mon Apr 20 11:28:51 2020 +++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Apr 22 16:51:56 2020 @@ -1,19 +1,17 @@ -# $NetBSD: XEN3_DOMU,v 1.90.6.3 2020/04/20 11:28:51 bouyer Exp $ +# $NetBSD: XEN3_DOMU,v 1.90.6.4 2020/04/22 16:51:56 bouyer Exp $ include "arch/amd64/conf/std.xen" options XENPV # PV domU support options MULTIPROCESSOR -options HZ=20 - options INCLUDE_CONFIG_FILE # embed config file in kernel binary #options UVMHIST #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.90.6.3 $" +#ident "XEN3_DOMU-$Revision: 1.90.6.4 $" maxusers 32 # estimated number of users
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:35:47 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: On second thought, don't include more than one spelling for thai units To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/units/units.lib 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/units/units.lib diff -u src/usr.bin/units/units.lib:1.21 src/usr.bin/units/units.lib:1.22 --- src/usr.bin/units/units.lib:1.21 Wed Apr 22 16:21:37 2020 +++ src/usr.bin/units/units.lib Wed Apr 22 16:35:47 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.21 2020/04/22 16:21:37 scole Exp $ +/ $NetBSD: units.lib,v 1.22 2020/04/22 16:35:47 scole Exp $ / primitive units @@ -658,15 +658,13 @@ krabiat 0.5208 cm nio 4 krabiat khuep 12 nio sok 2 khuep -wa 4 sok -wah wa -sen 20 wa +wah 4 sok +sen 20 wah yot 400 sen / Thai area tarangwah 4 m2 -talangwah tarangwah ngan 100 tarangwah rai 4 ngan @@ -674,7 +672,6 @@ rai 4 ngan salueng 3.75 gm baht 4 salueng -bat baht tamlueng 4 baht chang 20 tamlueng hap 50 chang
CVS commit: src/regress/sys/arch/i386
Module Name:src Committed By: maxv Date: Wed Apr 22 16:24:15 UTC 2020 Modified Files: src/regress/sys/arch/i386: Makefile Removed Files: src/regress/sys/arch/i386/ldt: Makefile testldt.c Log Message: We have USER_LDT tests in ATF, remove the ones from regress. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/regress/sys/arch/i386/Makefile cvs rdiff -u -r1.9 -r0 src/regress/sys/arch/i386/ldt/Makefile cvs rdiff -u -r1.17 -r0 src/regress/sys/arch/i386/ldt/testldt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/sys/arch/i386/Makefile diff -u src/regress/sys/arch/i386/Makefile:1.8 src/regress/sys/arch/i386/Makefile:1.9 --- src/regress/sys/arch/i386/Makefile:1.8 Sat Aug 12 07:40:43 2017 +++ src/regress/sys/arch/i386/Makefile Wed Apr 22 16:24:15 2020 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.8 2017/08/12 07:40:43 maxv Exp $ +# $NetBSD: Makefile,v 1.9 2020/04/22 16:24:15 maxv Exp $ -SUBDIR+= ldt #SUBDIR+= ioperm iopl .include
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:21:37 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add more Thai length, area and weight units To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/units/units.lib 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/units/units.lib diff -u src/usr.bin/units/units.lib:1.20 src/usr.bin/units/units.lib:1.21 --- src/usr.bin/units/units.lib:1.20 Tue Mar 21 01:21:59 2017 +++ src/usr.bin/units/units.lib Wed Apr 22 16:21:37 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.20 2017/03/21 01:21:59 scole Exp $ +/ $NetBSD: units.lib,v 1.21 2020/04/22 16:21:37 scole Exp $ / primitive units @@ -652,9 +652,30 @@ worstedyarncount 1680 ft/pound metricyarncount meter/gram jewlerspoint 2 milligram -/ thai measurements +/ Thai length -wah 2 m -ngan 400 m2 -rai 1600 m2 +krabiat 0.5208 cm +nio 4 krabiat +khuep 12 nio +sok 2 khuep +wa 4 sok +wah wa +sen 20 wa +yot 400 sen + +/ Thai area + +tarangwah 4 m2 +talangwah tarangwah +ngan 100 tarangwah +rai 4 ngan + +/ Thai weight + +salueng 3.75 gm +baht 4 salueng +bat baht +tamlueng 4 baht +chang 20 tamlueng +hap 50 chang
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: christos Date: Wed Apr 22 15:55:41 UTC 2020 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_acl_platform_posix1e.c Log Message: make variable constant since it is assigned from a string literal To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.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/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c diff -u src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c:1.2 --- src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c:1.1.1.1 Thu Apr 20 08:55:53 2017 +++ src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c Wed Apr 22 11:55:41 2020 @@ -364,8 +364,8 @@ DEFINE_TEST(test_acl_platform_posix1e_re struct archive *a; struct archive_entry *ae; int n, fd, flags, dflags; - char *func, *acl_text; - const char *acl1_text, *acl2_text, *acl3_text; + char *acl_text; + const char *func, *acl1_text, *acl2_text, *acl3_text; #if ARCHIVE_ACL_SUNOS void *aclp; int aclcnt;
CVS commit: src/external/bsd/libarchive/dist/libarchive/test
Module Name:src Committed By: christos Date: Wed Apr 22 15:55:55 UTC 2020 Modified Files: src/external/bsd/libarchive/dist/libarchive/test: test_acl_platform_nfs4.c Log Message: Add missing break's To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.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/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c diff -u src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c:1.2 --- src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c:1.1.1.2 Wed Jul 24 09:50:38 2019 +++ src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c Wed Apr 22 11:55:55 2020 @@ -634,9 +634,11 @@ acl_match(acl_entry_t aclent, struct mya case ACL_ENTRY_TYPE_AUDIT: if (myacl->type != ARCHIVE_ENTRY_ACL_TYPE_AUDIT) return (0); + break; case ACL_ENTRY_TYPE_ALARM: if (myacl->type != ARCHIVE_ENTRY_ACL_TYPE_ALARM) return (0); + break; default: return (0); }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Wed Apr 22 15:39:59 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add an eclectic mix of GeForce GTX 680, RTS522A PCI-E Card Reader, intel wifi 9560 + whitespace To generate a diff of this commit: cvs rdiff -u -r1.1409 -r1.1410 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1409 src/sys/dev/pci/pcidevs:1.1410 --- src/sys/dev/pci/pcidevs:1.1409 Wed Apr 22 06:35:58 2020 +++ src/sys/dev/pci/pcidevs Wed Apr 22 15:39:59 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1409 2020/04/22 06:35:58 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1410 2020/04/22 15:39:59 prlw1 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 @@ -5475,6 +5475,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 3HS_Y_P_LPC 0x9d83 300 Series Premiun-Y LPC product INTEL 3HS_U_P_LPC 0x9d84 300 Series Premium-U LPC product INTEL 3HS_U_M_LPC 0x9d84 300 Series Mainstream/Base U LPC @@ -6804,6 +6805,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 @@ -7211,6 +7213,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
CVS commit: src/share/misc
Module Name:src
Committed By: ginsbach
Date: Wed Apr 22 15:03:46 UTC 2020
Modified Files:
src/share/misc: acronyms
Log Message:
Add RFI, RFP
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/share/misc/acronyms
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.298 src/share/misc/acronyms:1.299
--- src/share/misc/acronyms:1.298 Thu Mar 26 18:25:32 2020
+++ src/share/misc/acronyms Wed Apr 22 15:03:46 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.298 2020/03/26 18:25:32 leot Exp $
+$NetBSD: acronyms,v 1.299 2020/04/22 15:03:46 ginsbach Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -472,6 +472,8 @@ 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
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jdolecek
Date: Wed Apr 22 14:26:27 UTC 2020
Modified Files:
src/sys/dev/pci: if_msk.c
Log Message:
show the 'interrupting at ...' info on boot
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 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.99 src/sys/dev/pci/if_msk.c:1.100
--- src/sys/dev/pci/if_msk.c:1.99 Sat Apr 18 17:31:52 2020
+++ src/sys/dev/pci/if_msk.c Wed Apr 22 14:26:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.99 2020/04/18 17:31:52 jakllsch Exp $ */
+/* $NetBSD: if_msk.c,v 1.100 2020/04/22 14:26:27 jdolecek 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.99 2020/04/18 17:31:52 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.100 2020/04/22 14:26:27 jdolecek Exp $");
#include
#include
@@ -1689,6 +1689,8 @@ mskc_attach(device_t parent, device_t se
aprint_normal(" rev. %s", revstr);
aprint_normal(" (0x%x): %s\n", sc->sk_rev, intrstr);
+ aprint_normal_dev(sc->sk_dev, "interrupting at %s\n", intrstr);
+
sc->sk_macs = 1;
hw = sk_win_read_1(sc, SK_Y2_HWRES);
CVS commit: src/sys/lib/libkern/arch/m68k
Module Name:src
Committed By: rin
Date: Wed Apr 22 11:58:26 UTC 2020
Added Files:
src/sys/lib/libkern/arch/m68k: divsi3.S modsi3.S udivsi3.S umodsi3.S
Log Message:
Restrict usage of m68k assembler versions of {,u}divsi3 and {,u}divsi3 to
kernel and bootloader for 68010.
They requires a special calling convention to udivsi3, and cannot to be
mixed up in normal routines provided by libgcc or compiler_rt. Although,
there's no problem for using in a controlled situation, i.e., kernel and
standalone programs.
Note that this does not affect m68k ports other than sun2, since codes
generated by gcc do not call these routines.
Assembler files are moved from common/lib/libc/arch/m68k/gen to
sys/lib/libkern/arch/m68k in order not to be compiled in libc.
Revert hack introduced to lib/libc/compiler_rt/Makefile.inc rev 1.37:
http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/compiler_rt/Makefile.inc#rev1.37
Proposed on port-sun2@ with no response...
(Again, this does not affect m68k ports other than sun2.)
http://mail-index.netbsd.org/port-sun2/2020/03/10/msg000102.html
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/sys/lib/libkern/arch/m68k/divsi3.S \
src/sys/lib/libkern/arch/m68k/modsi3.S \
src/sys/lib/libkern/arch/m68k/umodsi3.S
cvs rdiff -u -r0 -r1.5 src/sys/lib/libkern/arch/m68k/udivsi3.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/lib/libkern/arch/m68k/divsi3.S
diff -u /dev/null src/sys/lib/libkern/arch/m68k/divsi3.S:1.3
--- /dev/null Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/divsi3.S Wed Apr 22 11:58:26 2020
@@ -0,0 +1,71 @@
+/* $NetBSD: divsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $ */
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+ RCSID("from: @(#)divsi3.s 5.1 (Berkeley) 6/7/90")
+#else
+ RCSID("$NetBSD: divsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $")
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+/* int / int */
+#ifndef __mc68010__
+#error
+ENTRY(__divsi3)
+ movel 4(%sp),%d0
+ divsl 8(%sp),%d0
+ rts
+END(__divsi3)
+#else
+ENTRY(__divsi3)
+| NB: this requires that __udivsi3 preserve %a0:
+ movel 4(%sp), %d1 | load the dividend
+ bpl 1f
+ negl 4(%sp) | store abs(dividend)
+1: movel 8(%sp), %d0 | load the divisor
+ bpl 2f
+ negl 8(%sp) | store abs(divisor)
+2: eorl %d1, %d0
+ bpl 3f | branch if sgn(divisor) == sgn(dividend)
+ movel (%sp)+, %a0 | pop return address
+ pea (.Lret,%pc) | push our return address
+3: jmp _C_LABEL(__udivsi3)
+.Lret: negl %d0 | negate quotient
+ jmp (%a0)
+END(__divsi3)
+#endif /* __mc68010__ */
Index: src/sys/lib/libkern/arch/m68k/modsi3.S
diff -u /dev/null src/sys/lib/libkern/arch/m68k/modsi3.S:1.3
--- /dev/null Wed Apr 22 11:58:26 2020
+++ src/sys/lib/libkern/arch/m68k/modsi3.S Wed Apr 22 11:58:26 2020
@@ -0,0 +1,77 @@
+/* $NetBSD: modsi3.S,v 1.3 2020/04/22 11:58:26 rin Exp $ */
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department.
+ *
+ *
CVS commit: src/sys/sys
Module Name:src Committed By: rin Date: Wed Apr 22 09:23:21 UTC 2020 Modified Files: src/sys/sys: cdefs.h Log Message: For NO_KERNEL_RCSIDS, strip __RCSID() also for src/common/*. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/sys/cdefs.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/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.153 src/sys/sys/cdefs.h:1.154 --- src/sys/sys/cdefs.h:1.153 Fri Apr 17 14:59:23 2020 +++ src/sys/sys/cdefs.h Wed Apr 22 09:23:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.153 2020/04/17 14:59:23 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.154 2020/04/22 09:23:21 rin Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -481,12 +481,12 @@ #endif #endif /* !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) */ -#if defined(_KERNEL) -#if defined(NO_KERNEL_RCSIDS) -#undef __KERNEL_RCSID -#define __KERNEL_RCSID(_n, _s) /* nothing */ -#endif /* NO_KERNEL_RCSIDS */ -#endif /* _KERNEL */ +#if defined(_KERNEL) && defined(NO_KERNEL_RCSIDS) +#undef __KERNEL_RCSID +#define __KERNEL_RCSID(_n, _s) /* nothing */ +#undef __RCSID +#define __RCSID(_s) /* nothing */ +#endif #if !defined(_STANDALONE) && !defined(_KERNEL) #if defined(__GNUC__) || defined(__PCC__)
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Wed Apr 22 09:18:42 UTC 2020 Modified Files: src/sys/kern: files.kern Log Message: At the moment, we need kern/uipc_mbufdebug.c only if DDB is enabled. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/kern/files.kern 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/files.kern diff -u src/sys/kern/files.kern:1.44 src/sys/kern/files.kern:1.45 --- src/sys/kern/files.kern:1.44 Mon Mar 2 16:00:54 2020 +++ src/sys/kern/files.kern Wed Apr 22 09:18:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.kern,v 1.44 2020/03/02 16:00:54 riastradh Exp $ +# $NetBSD: files.kern,v 1.45 2020/04/22 09:18:42 rin Exp $ # # kernel sources @@ -183,7 +183,7 @@ file kern/tty_tty.c kern file kern/uipc_accf.c kern file kern/uipc_domain.c kern file kern/uipc_mbuf.c kern -file kern/uipc_mbufdebug.c kern & ether +file kern/uipc_mbufdebug.c kern & ether & ddb file net/link_proto.c kern # XXX file kern/uipc_proto.c kern file kern/uipc_sem.c kern
CVS commit: src/sys
Module Name:src Committed By: rin Date: Wed Apr 22 09:15:40 UTC 2020 Modified Files: src/sys/arch/i386/conf: files.i386 src/sys/arch/x86/conf: files.x86 src/sys/conf: files src/sys/crypto/rijndael: files.rijndael src/sys/dev/marvell: files.armada src/sys/netipsec: files.netipsec src/sys/opencrypto: files.opencrypto Log Message: Make crypto/rijindael optional again as cprng_strong does no longer depend on it. Dependency is explicitly declared in files.foo if a component requires it. To generate a diff of this commit: cvs rdiff -u -r1.401 -r1.402 src/sys/arch/i386/conf/files.i386 cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.1265 -r1.1266 src/sys/conf/files cvs rdiff -u -r1.6 -r1.7 src/sys/crypto/rijndael/files.rijndael cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/files.armada cvs rdiff -u -r1.13 -r1.14 src/sys/netipsec/files.netipsec cvs rdiff -u -r1.28 -r1.29 src/sys/opencrypto/files.opencrypto 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/i386/conf/files.i386 diff -u src/sys/arch/i386/conf/files.i386:1.401 src/sys/arch/i386/conf/files.i386:1.402 --- src/sys/arch/i386/conf/files.i386:1.401 Fri Oct 18 01:38:28 2019 +++ src/sys/arch/i386/conf/files.i386 Wed Apr 22 09:15:39 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.401 2019/10/18 01:38:28 manu Exp $ +# $NetBSD: files.i386,v 1.402 2020/04/22 09:15:39 rin Exp $ # # new style config file for i386 architecture # @@ -418,7 +418,7 @@ obsolete defparam opt_vesafb.h VESAFB_WI obsolete defflag opt_vesafb.h VESAFB_PM # AMD Geode LX Security Block -device glxsb: opencrypto +device glxsb: opencrypto, rijndael attach glxsb at pci file arch/i386/pci/glxsb.c glxsb Index: src/sys/arch/x86/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.108 src/sys/arch/x86/conf/files.x86:1.109 --- src/sys/arch/x86/conf/files.x86:1.108 Tue Apr 21 02:56:36 2020 +++ src/sys/arch/x86/conf/files.x86 Wed Apr 22 09:15:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.108 2020/04/21 02:56:36 msaitoh Exp $ +# $NetBSD: files.x86,v 1.109 2020/04/22 09:15:40 rin Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPDEBUG MPBIOS_SCANPCI @@ -59,7 +59,7 @@ device odcm attach odcm at cpufeaturebus file arch/x86/x86/odcm.c odcm -device padlock: opencrypto +device padlock: opencrypto, rijndael attach padlock at cpufeaturebus file arch/x86/x86/via_padlock.c padlock Index: src/sys/conf/files diff -u src/sys/conf/files:1.1265 src/sys/conf/files:1.1266 --- src/sys/conf/files:1.1265 Wed Apr 15 17:16:22 2020 +++ src/sys/conf/files Wed Apr 22 09:15:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1265 2020/04/15 17:16:22 maxv Exp $ +# $NetBSD: files,v 1.1266 2020/04/22 09:15:40 rin Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -452,7 +452,7 @@ define arcnet define ether define ieee1394 define sppp -define wlan +define wlan: rijndael define crypto # TPM @@ -1394,7 +1394,7 @@ file dev/ic/amdccp.c amdccp defpseudodev vnd: disk defflag opt_vnd.h VND_COMPRESSION defpseudo ccd: disk -defpseudodev cgd: disk, des, blowfish, cast128 +defpseudodev cgd: disk, des, blowfish, cast128, rijndael defpseudodev md: disk defpseudodev fss: disk Index: src/sys/crypto/rijndael/files.rijndael diff -u src/sys/crypto/rijndael/files.rijndael:1.6 src/sys/crypto/rijndael/files.rijndael:1.7 --- src/sys/crypto/rijndael/files.rijndael:1.6 Sat Nov 19 22:51:22 2011 +++ src/sys/crypto/rijndael/files.rijndael Wed Apr 22 09:15:40 2020 @@ -1,5 +1,7 @@ -# $NetBSD: files.rijndael,v 1.6 2011/11/19 22:51:22 tls Exp $ +# $NetBSD: files.rijndael,v 1.7 2020/04/22 09:15:40 rin Exp $ -file crypto/rijndael/rijndael-alg-fst.c -file crypto/rijndael/rijndael-api-fst.c -file crypto/rijndael/rijndael.c +define rijndael + +file crypto/rijndael/rijndael-alg-fst.c rijndael +file crypto/rijndael/rijndael-api-fst.c rijndael +file crypto/rijndael/rijndael.c rijndael Index: src/sys/dev/marvell/files.armada diff -u src/sys/dev/marvell/files.armada:1.4 src/sys/dev/marvell/files.armada:1.5 --- src/sys/dev/marvell/files.armada:1.4 Tue Oct 1 17:35:09 2019 +++ src/sys/dev/marvell/files.armada Wed Apr 22 09:15:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.armada,v 1.4 2019/10/01 17:35:09 chs Exp $ +# $NetBSD: files.armada,v 1.5 2020/04/22 09:15:40 rin Exp $ # Configuration info for Marvell ARMADA integrated peripherals # ARMADA XP Buffer Manger @@ -10,5 +10,5 @@ device mvxpe: mvxpbm, ether, ifnet, arp, file dev/marvell/if_mvxpe.c mvxpe needs-flag # ARMADA XP Cryptographic Engines and Security Accelerator -device mvxpsec: opencrypto +device mvxpsec: opencrypto, rijndael file dev/marvell/mvxpsec.c mvxpsec needs-flag Index: src/sys/netipsec/files.netipsec diff -u src/sys/netipsec/files.netipsec:1.13 src/sys/netipsec/files.netipsec:1.14 ---
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: rin
Date: Wed Apr 22 08:48:12 UTC 2020
Modified Files:
src/lib/libc/stdlib: jemalloc.c
Log Message:
Use __mc68010__ to distinguish m68000 (sun2) from other m68k ports;
__mc68000__ is defined both for m68000 and m68k.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libc/stdlib/jemalloc.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/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.50 src/lib/libc/stdlib/jemalloc.c:1.51
--- src/lib/libc/stdlib/jemalloc.c:1.50 Wed Apr 22 08:45:06 2020
+++ src/lib/libc/stdlib/jemalloc.c Wed Apr 22 08:48:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $ */
+/* $NetBSD: jemalloc.c,v 1.51 2020/04/22 08:48:12 rin Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans .
@@ -117,7 +117,7 @@
#include
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
-__RCSID("$NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.51 2020/04/22 08:48:12 rin Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@@ -271,8 +271,8 @@ __RCSID("$NetBSD: jemalloc.c,v 1.50 2020
# define QUANTUM_2POW_MIN 4
# define SIZEOF_PTR_2POW 2
# define USE_BRK
-# ifdef __mc68000__
-# define NO_TLS
+# ifdef __mc68010__
+#define NO_TLS
# endif
#endif
#if defined(__mips__) || defined(__riscv__)
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: rin
Date: Wed Apr 22 08:45:06 UTC 2020
Modified Files:
src/lib/libc/stdlib: jemalloc.c
Log Message:
Fix previous for libhack, where _REENTRANT is not defined;
arenas_map_key is used only when NO_TLS && _REENTRANT.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/libc/stdlib/jemalloc.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/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.49 src/lib/libc/stdlib/jemalloc.c:1.50
--- src/lib/libc/stdlib/jemalloc.c:1.49 Tue Apr 21 22:22:55 2020
+++ src/lib/libc/stdlib/jemalloc.c Wed Apr 22 08:45:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.49 2020/04/21 22:22:55 joerg Exp $ */
+/* $NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans .
@@ -117,7 +117,7 @@
#include
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
-__RCSID("$NetBSD: jemalloc.c,v 1.49 2020/04/21 22:22:55 joerg Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.50 2020/04/22 08:45:06 rin Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@@ -775,14 +775,14 @@ static __attribute__((tls_model("initial
__thread arena_t **arenas_map;
#else
static arena_t **arenas_map;
-static thread_key_t arenas_map_key = -1;
#endif
#if !defined(NO_TLS) || !defined(_REENTRANT)
# define get_arenas_map() (arenas_map)
# define set_arenas_map(x) (arenas_map = x)
-#else
+#else /* NO_TLS && _REENTRANT */
+static thread_key_t arenas_map_key = -1;
static inline arena_t **
get_arenas_map(void)
@@ -823,7 +823,7 @@ set_arenas_map(arena_t **a)
thr_setspecific(arenas_map_key, a);
#endif
}
-#endif
+#endif /* NO_TLS && _REENTRANT */
#ifdef MALLOC_STATS
/* Chunk statistics. */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Apr 22 07:17:02 UTC 2020 Modified Files: src/sys/dev/pci: ichsmb.c Log Message: Add Whiskey Lake U and Amber Lake Y support. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/ichsmb.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/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.67 src/sys/dev/pci/ichsmb.c:1.68 --- src/sys/dev/pci/ichsmb.c:1.67 Thu Apr 16 18:32:29 2020 +++ src/sys/dev/pci/ichsmb.c Wed Apr 22 07:17:01 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.67 2020/04/16 18:32:29 msaitoh Exp $ */ +/* $NetBSD: ichsmb.c,v 1.68 2020/04/22 07:17:01 msaitoh Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.67 2020/04/16 18:32:29 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.68 2020/04/22 07:17:01 msaitoh Exp $"); #include #include @@ -127,6 +127,7 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_100SERIES_LP_SMB: case PCI_PRODUCT_INTEL_2HS_SMB: case PCI_PRODUCT_INTEL_3HS_SMB: + case PCI_PRODUCT_INTEL_3HS_U_SMB: case PCI_PRODUCT_INTEL_CORE4G_M_SMB: case PCI_PRODUCT_INTEL_CORE5G_M_SMB: case PCI_PRODUCT_INTEL_CMTLK_SMB:
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Apr 22 06:36:32 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1395 -r1.1396 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1394 -r1.1395 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Apr 22 06:35:58 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel Whiskey Lake U and Amber Lake Y devices. To generate a diff of this commit: cvs rdiff -u -r1.1408 -r1.1409 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1408 src/sys/dev/pci/pcidevs:1.1409 --- src/sys/dev/pci/pcidevs:1.1408 Wed Apr 22 06:35:01 2020 +++ src/sys/dev/pci/pcidevs Wed Apr 22 06:35:58 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1408 2020/04/22 06:35:01 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1409 2020/04/22 06:35:58 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5204,6 +5204,7 @@ product INTEL PCI450_MC 0x84c5 82451KX/ product INTEL 82451NX_MIOC 0x84ca 82451NX Memory & I/O Controller (MIOC) product INTEL 82451NX_PXB 0x84cb 82451NX PCI Expander Bridge (PXB) product INTEL AMBLK_Y_GT2_2 0x87c0 UHD Graphics 617 (GT2) +product INTEL AMBLK_Y_IGD 0x87ca UHD Graphics product INTEL EG20T_PCIB 0x8800 EG20T PCH PCIe Bridge product INTEL EG20T_PCTHUB 0x8801 EG20T PCH Packet Hub product INTEL EG20T_GBE 0x8802 EG20T PCH Gigabit Ether @@ -5474,6 +5475,59 @@ 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 3HS_Y_P_LPC 0x9d83 300 Series Premiun-Y LPC +product INTEL 3HS_U_P_LPC 0x9d84 300 Series Premium-U LPC +product INTEL 3HS_U_M_LPC 0x9d84 300 Series Mainstream/Base U LPC +product INTEL 3HS_U_P2SB 0x9da0 300 Series P2SB +product INTEL 3HS_U_PMC 0x9da1 300 Series PMC +product INTEL 3HS_U_SMB 0x9da3 300 Series SMBus +product INTEL 3HS_U_SPI_FLASH 0x9da4 300 Series SPI (flash) +product INTEL 3HS_U_TRACE 0x9da6 300 Series Trace Hub +product INTEL 3HS_U_UART_0 0x9da8 300 Series UART #0 +product INTEL 3HS_U_UART_1 0x9da9 300 Series UART #1 +product INTEL 3HS_U_SPI_0 0x9daa 300 Series SPI #0 +product INTEL 3HS_U_SPI_1 0x9dab 300 Series SPI #1 +product INTEL 3HS_U_PCIE_9 0x9db0 300 Series PCIe Root Port 9 +product INTEL 3HS_U_PCIE_10 0x9db1 300 Series PCIe Root Port 10 +product INTEL 3HS_U_PCIE_11 0x9db2 300 Series PCIe Root Port 11 +product INTEL 3HS_U_PCIE_12 0x9db3 300 Series PCIe Root Port 12 +product INTEL 3HS_U_PCIE_13 0x9db4 300 Series PCIe Root Port 13 +product INTEL 3HS_U_PCIE_14 0x9db5 300 Series PCIe Root Port 14 +product INTEL 3HS_U_PCIE_15 0x9db6 300 Series PCIe Root Port 15 +product INTEL 3HS_U_PCIE_16 0x9db7 300 Series PCIe Root Port 16 +product INTEL 3HS_U_PCIE_1 0x9db8 300 Series PCIe Root Port 1 +product INTEL 3HS_U_PCIE_2 0x9db9 300 Series PCIe Root Port 2 +product INTEL 3HS_U_PCIE_3 0x9dba 300 Series PCIe Root Port 3 +product INTEL 3HS_U_PCIE_4 0x9dbb 300 Series PCIe Root Port 4 +product INTEL 3HS_U_PCIE_5 0x9dbc 300 Series PCIe Root Port 5 +product INTEL 3HS_U_PCIE_6 0x9dbd 300 Series PCIe Root Port 6 +product INTEL 3HS_U_PCIE_7 0x9dbe 300 Series PCIe Root Port 7 +product INTEL 3HS_U_PCIE_8 0x9dbf 300 Series PCIe Root Port 8 +product INTEL 3HS_U_EMMC 0x9dc4 300 Series eMMC +product INTEL 3HS_U_I2C_4 0x9dc5 300 Series I2C #4 +product INTEL 3HS_U_I2C_5 0x9dc6 300 Series I2C #5 +product INTEL 3HS_U_UART_2 0x9dc7 300 Series UART #2 +product INTEL 3HS_U_HDA 0x9dc8 300 Series HD Audio +product INTEL 3HS_U_AHCI 0x9dd3 300 Series SATA AHCI +product INTEL 3HS_U_RAID_1 0x9dd5 300 Series SATA RAID +product INTEL 3HS_U_RAID_2 0x9dd7 300 Series SATA RAID premium +product INTEL 3HS_U_MEI_1 0x9de0 300 Series MEI #1 +product INTEL 3HS_U_MEI_2 0x9de1 300 Series MEI #2 +product INTEL 3HS_U_IDER 0x9de2 300 Series IDE-R +product INTEL 3HS_U_KT 0x9de3 300 Series KT +product INTEL 3HS_U_MEI_3 0x9de4 300 Series MEI #3 +product INTEL 3HS_U_MEI_4 0x9de5 300 Series MEI #4 +product INTEL 3HS_U_I2C_0 0x9de8 300 Series I2C #0 +product INTEL 3HS_U_I2C_1 0x9de9 300 Series I2C #1 +product INTEL 3HS_U_I2C_2 0x9dea 300 Series I2C #2 +product INTEL 3HS_U_I2C_3 0x9deb 300 Series I2C #3 +product INTEL 3HS_U_XHCI 0x9ded 300 Series USB 3.1 xHCI +product INTEL 3HS_U_SSRAM 0x9def 300 Series Shared SRAM +product INTEL WL_9560_1 0x9df0 Dual Band Wireless AC 9560 +product INTEL 3HS_U_SDXC 0x9df5 300 Series SDXC +product INTEL 3HS_U_THERM 0x9df9 300 Series Thermal +product INTEL 3HS_U_SPI_2 0x9dfb 300 Series SPI #2 +product INTEL 3HS_U_ISH 0x9dfc 300 Series Image Sensor Hub 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
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Apr 22 06:35:01 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Aquantia AQC100, AQC100S and D100. To generate a diff of this commit: cvs rdiff -u -r1.1407 -r1.1408 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1407 src/sys/dev/pci/pcidevs:1.1408 --- src/sys/dev/pci/pcidevs:1.1407 Sat Apr 18 07:09:33 2020 +++ src/sys/dev/pci/pcidevs Wed Apr 22 06:35:01 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1407 2020/04/18 07:09:33 simonb Exp $ +$NetBSD: pcidevs,v 1.1408 2020/04/22 06:35:01 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1289,16 +1289,19 @@ product APPLE INTREPID2_GMAC 0x006b Intr product APPLE BCM5701 0x1645 BCM5701 /* Aquantia Corp. */ +product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter +product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter product AQUANTIA AQC107S 0x87b1 AQC107S 10 Gigabit Network Adapter product AQUANTIA AQC108S 0x88b1 AQC108S 5 Gigabit Network Adapter product AQUANTIA AQC109S 0x89b1 AQC109S 2.5 Gigabit Network Adapter product AQUANTIA AQC111S 0x91b1 AQC111S 5 Gigabit Network Adapter product AQUANTIA AQC112S 0x92b1 AQC112S 2.5 Gigabit Network Adapter +product AQUANTIA D100 0xd100 D100 10 Gigabit Network Adapter product AQUANTIA D107 0xd107 D107 10 Gigabit Network Adapter product AQUANTIA D108 0xd108 D108 5 Gigabit Network Adapter product AQUANTIA D109 0xd109 D109 2.5 Gigabit Network Adapter
