CVS commit: [pgoyette-localcount] src/sys/dev/pci
Module Name:src Committed By: pgoyette Date: Wed Apr 26 05:52:57 UTC 2017 Modified Files: src/sys/dev/pci [pgoyette-localcount]: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1246.2.5 -r1.1246.2.6 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1245.2.5 -r1.1245.2.6 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.1246.2.5 src/sys/dev/pci/pcidevs.h:1.1246.2.6 --- src/sys/dev/pci/pcidevs.h:1.1246.2.5 Wed Apr 26 02:53:13 2017 +++ src/sys/dev/pci/pcidevs.h Wed Apr 26 05:52:48 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pcidevs.h,v 1.1246.2.5 2017/04/26 02:53:13 pgoyette Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1246.2.6 2017/04/26 05:52:48 pgoyette Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -701,6 +701,7 @@ #define PCI_PRODUCT_3COM_3C339 0x3390 /* 3c339 TokenLink Velocity */ #define PCI_PRODUCT_3COM_3C359 0x3590 /* 3c359 TokenLink Velocity XL */ #define PCI_PRODUCT_3COM_3C450TX 0x4500 /* 3c450-TX 10/100 Ethernet */ +#define PCI_PRODUCT_3COM_3C555 0x5055 /* 3c555 10/100 Mini-PCI Ethernet */ #define PCI_PRODUCT_3COM_3C575TX 0x5057 /* 3c575-TX 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C575BTX 0x5157 /* 3CCFE575BT 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C575CTX 0x5257 /* 3CCFE575CT 10/100 Ethernet */ @@ -708,7 +709,6 @@ #define PCI_PRODUCT_3COM_3C595TX 0x5950 /* 3c595-TX 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C595T4 0x5951 /* 3c595-T4 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C595MII 0x5952 /* 3c595-MII 10/100 Ethernet */ -#define PCI_PRODUCT_3COM_3C555 0x5055 /* 3c555 10/100 Mini-PCI Ethernet */ #define PCI_PRODUCT_3COM_3C154G72 0x6001 /* 3CRWE154G72 Wireless LAN Adapter */ #define PCI_PRODUCT_3COM_3C556 0x6055 /* 3c556 10/100 Mini-PCI Ethernet */ #define PCI_PRODUCT_3COM_3C556B 0x6056 /* 3c556B 10/100 Mini-PCI Ethernet */ @@ -724,11 +724,11 @@ #define PCI_PRODUCT_3COM_TOKEN 0x8811 /* Token Ring */ #define PCI_PRODUCT_3COM_3C900TPO 0x9000 /* 3c900-TPO Ethernet */ #define PCI_PRODUCT_3COM_3C900COMBO 0x9001 /* 3c900-COMBO Ethernet */ -#define PCI_PRODUCT_3COM_3C905TX 0x9050 /* 3c905-TX 10/100 Ethernet */ -#define PCI_PRODUCT_3COM_3C905T4 0x9051 /* 3c905-T4 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C900BTPO 0x9004 /* 3c900B-TPO Ethernet */ #define PCI_PRODUCT_3COM_3C900BCOMBO 0x9005 /* 3c900B-COMBO Ethernet */ #define PCI_PRODUCT_3COM_3C900BTPC 0x9006 /* 3c900B-TPC Ethernet */ +#define PCI_PRODUCT_3COM_3C905TX 0x9050 /* 3c905-TX 10/100 Ethernet */ +#define PCI_PRODUCT_3COM_3C905T4 0x9051 /* 3c905-T4 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C905BTX 0x9055 /* 3c905B-TX 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C905BT4 0x9056 /* 3c905B-T4 10/100 Ethernet */ #define PCI_PRODUCT_3COM_3C905BCOMBO 0x9058 /* 3c905B-COMBO 10/100 Ethernet */ @@ -829,13 +829,13 @@ #define PCI_PRODUCT_ALI_M1689 0x1689 /* M1689 Host-PCI Bridge */ #define PCI_PRODUCT_ALI_M3309 0x3309 /* M3309 MPEG Decoder */ #define PCI_PRODUCT_ALI_M4803 0x5215 /* M4803 */ -#define PCI_PRODUCT_ALI_M5257 0x5257 /* M5257 PCI Software Modem */ #define PCI_PRODUCT_ALI_M5229 0x5229 /* M5229 UDMA IDE Controller */ #define PCI_PRODUCT_ALI_M5237 0x5237 /* M5237 USB 1.1 Host Controller */ #define PCI_PRODUCT_ALI_M5239 0x5239 /* M5239 USB 2.0 Host Controller */ #define PCI_PRODUCT_ALI_M5243 0x5243 /* M5243 PCI-AGP Bridge */ #define PCI_PRODUCT_ALI_M5247 0x5247 /* M5247 PCI-AGP Bridge */ #define PCI_PRODUCT_ALI_M5249 0x5249 /* M5249 Hypertransport to PCI Bridge */ +#define PCI_PRODUCT_ALI_M5257 0x5257 /* M5257 PCI Software Modem */ #define PCI_PRODUCT_ALI_M5261 0x5261 /* M5261 Tulip Ethernet Controller */ #define PCI_PRODUCT_ALI_M5288 0x5288 /* M5288 SATA/Raid Controller */ #define PCI_PRODUCT_ALI_M5451 0x5451 /* M5451 AC-Link Controller Audio Device */ @@ -849,10 +849,10 @@ #define PCI_PRODUCT_ADP_AIC7855 0x5578 /* AIC-7855 */ #define PCI_PRODUCT_ADP_AIC5900 0x5900 /* AIC-5900 ATM */ #define PCI_PRODUCT_ADP_AIC5905 0x5905 /* AIC-5905 ATM */ -#define PCI_PRODUCT_ADP_AIC6915 0x6915 /* AIC-6915 10/100 Ethernet */ -#define PCI_PRODUCT_ADP_AIC7860 0x6078 /* AIC-7860 */ #define PCI_PRODUCT_ADP_APA1480 0x6075 /* APA-1480 Ultra */ +#define PCI_PRODUCT_ADP_AIC7860 0x6078 /* AIC-7860 */ #define PCI_PRODUCT_ADP_2940AU 0x6178 /* AHA-2940A Ultra */ +#define PCI_PRODUCT_ADP_AIC6915 0x6915 /* AIC-6915 10/100 Ethernet */ #define PCI_PRODUCT_ADP_AIC7870 0x7078 /* AIC-7870 */ #define PCI_PRODUCT_ADP_2940 0x7178 /* AHA-2940 */ #define PCI_PRODUCT_ADP_3940 0x7278 /* AHA-3940 */ @@ -883,6 +883,7 @@ #define PCI_PRODUCT_ADP2_AIC7899P 0x00cf /* AIC-7899P U160 */ #define PCI_PRODUCT_ADP2_1420SA 0x0241 /* RAID 1420SA */ #define PCI_PRODUCT_ADP2_1430SA 0x0243 /* RAID 1430SA */ +#define PCI_PRODUCT_ADP2_SERVERAID
CVS commit: [pgoyette-localcount] src/sys/dev/pci
Module Name:src Committed By: pgoyette Date: Wed Apr 26 05:35:36 UTC 2017 Modified Files: src/sys/dev/pci [pgoyette-localcount]: pcidevs Log Message: Somehow this got out of sync on the branch. To generate a diff of this commit: cvs rdiff -u -r1.1253.2.5 -r1.1253.2.6 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.1253.2.5 src/sys/dev/pci/pcidevs:1.1253.2.6 --- src/sys/dev/pci/pcidevs:1.1253.2.5 Wed Apr 26 02:53:13 2017 +++ src/sys/dev/pci/pcidevs Wed Apr 26 05:35:36 2017 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1253.2.5 2017/04/26 02:53:13 pgoyette Exp $ +$NetBSD: pcidevs,v 1.1253.2.6 2017/04/26 05:35:36 pgoyette Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -694,6 +694,7 @@ product 3COM 3C940 0x1700 3c940 Gigabit product 3COM 3C339 0x3390 3c339 TokenLink Velocity product 3COM 3C359 0x3590 3c359 TokenLink Velocity XL product 3COM 3C450TX 0x4500 3c450-TX 10/100 Ethernet +product 3COM 3C555 0x5055 3c555 10/100 Mini-PCI Ethernet product 3COM 3C575TX 0x5057 3c575-TX 10/100 Ethernet product 3COM 3C575BTX 0x5157 3CCFE575BT 10/100 Ethernet product 3COM 3C575CTX 0x5257 3CCFE575CT 10/100 Ethernet @@ -701,7 +702,6 @@ product 3COM 3C590 0x5900 3c590 Ethernet product 3COM 3C595TX 0x5950 3c595-TX 10/100 Ethernet product 3COM 3C595T4 0x5951 3c595-T4 10/100 Ethernet product 3COM 3C595MII 0x5952 3c595-MII 10/100 Ethernet -product 3COM 3C555 0x5055 3c555 10/100 Mini-PCI Ethernet product 3COM 3C154G72 0x6001 3CRWE154G72 Wireless LAN Adapter product 3COM 3C556 0x6055 3c556 10/100 Mini-PCI Ethernet product 3COM 3C556B 0x6056 3c556B 10/100 Mini-PCI Ethernet @@ -717,11 +717,11 @@ product 3COM 3C804 0x7980 3c804 FDDILink product 3COM TOKEN 0x8811 Token Ring product 3COM 3C900TPO 0x9000 3c900-TPO Ethernet product 3COM 3C900COMBO 0x9001 3c900-COMBO Ethernet -product 3COM 3C905TX 0x9050 3c905-TX 10/100 Ethernet -product 3COM 3C905T4 0x9051 3c905-T4 10/100 Ethernet product 3COM 3C900BTPO 0x9004 3c900B-TPO Ethernet product 3COM 3C900BCOMBO 0x9005 3c900B-COMBO Ethernet product 3COM 3C900BTPC 0x9006 3c900B-TPC Ethernet +product 3COM 3C905TX 0x9050 3c905-TX 10/100 Ethernet +product 3COM 3C905T4 0x9051 3c905-T4 10/100 Ethernet product 3COM 3C905BTX 0x9055 3c905B-TX 10/100 Ethernet product 3COM 3C905BT4 0x9056 3c905B-T4 10/100 Ethernet product 3COM 3C905BCOMBO 0x9058 3c905B-COMBO 10/100 Ethernet @@ -822,13 +822,13 @@ product ALI M1647 0x1647 M1647 Host-PCI product ALI M1689 0x1689 M1689 Host-PCI Bridge product ALI M3309 0x3309 M3309 MPEG Decoder product ALI M4803 0x5215 M4803 -product ALI M5257 0x5257 M5257 PCI Software Modem product ALI M5229 0x5229 M5229 UDMA IDE Controller product ALI M5237 0x5237 M5237 USB 1.1 Host Controller product ALI M5239 0x5239 M5239 USB 2.0 Host Controller product ALI M5243 0x5243 M5243 PCI-AGP Bridge product ALI M5247 0x5247 M5247 PCI-AGP Bridge product ALI M5249 0x5249 M5249 Hypertransport to PCI Bridge +product ALI M5257 0x5257 M5257 PCI Software Modem product ALI M5261 0x5261 M5261 Tulip Ethernet Controller product ALI M5288 0x5288 M5288 SATA/Raid Controller product ALI M5451 0x5451 M5451 AC-Link Controller Audio Device @@ -842,10 +842,10 @@ product ADP AIC7850 0x5078 AIC-7850 product ADP AIC7855 0x5578 AIC-7855 product ADP AIC5900 0x5900 AIC-5900 ATM product ADP AIC5905 0x5905 AIC-5905 ATM -product ADP AIC6915 0x6915 AIC-6915 10/100 Ethernet -product ADP AIC7860 0x6078 AIC-7860 product ADP APA1480 0x6075 APA-1480 Ultra +product ADP AIC7860 0x6078 AIC-7860 product ADP 2940AU 0x6178 AHA-2940A Ultra +product ADP AIC6915 0x6915 AIC-6915 10/100 Ethernet product ADP AIC7870 0x7078 AIC-7870 product ADP 2940 0x7178 AHA-2940 product ADP 3940 0x7278 AHA-3940 @@ -876,6 +876,7 @@ product ADP2 AIC7899F 0x00c5 AIC-7899F product ADP2 AIC7899P 0x00cf AIC-7899P U160 product ADP2 1420SA 0x0241 RAID 1420SA product ADP2 1430SA 0x0243 RAID 1430SA +product ADP2 SERVERAID 0x0250 ServeRAID 6/7 (marco) product ADP2 AAC2622 0x0282 AAC-2622 product ADP2 ASR2200S 0x0285 ASR-2200S product ADP2 ASR2120S 0x0286 ASR-2120S @@ -891,11 +892,10 @@ product ADP2 PERC_2QC 0x1364 Dell PERC /* XXX guess */ product ADP2 PERC_3QC 0x1365 Dell PERC 3/QC product ADP2 HP_M110_G2 0x3227 HP M110 G2 / ASR-2610SA -product ADP2 SERVERAID 0x0250 ServeRAID 6/7 (marco) /* Addtron Products */ -product ADDTRON 8139 0x1360 8139 Ethernet product ADDTRON RHINEII 0x1320 Rhine II 10/100 Ethernet +product ADDTRON 8139 0x1360 8139 Ethernet /* ADMtek products */ product ADMTEK AL981 0x0981 AL981 (Comet) 10/100 Ethernet @@ -920,9 +920,9 @@ product AGILENT TACHYON_DX2 0x0100 Tachy /* Aironet Wireless Communicasions products */ product AIRONET PC4xxx 0x0001 PC4500/PC4800 Wireless LAN Adapter product AIRONET PCI350 0x0350 PCI350 Wireless LAN Adapter -product AIRONET MPI350 0xa504
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Apr 26 03:54:37 UTC 2017
Modified Files:
src/sys/dev/pci: ppb.c
Log Message:
Disable and disestablish interrupt in ppbdetach().
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ppb.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/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.58 src/sys/dev/pci/ppb.c:1.59
--- src/sys/dev/pci/ppb.c:1.58 Mon Apr 24 23:01:45 2017
+++ src/sys/dev/pci/ppb.c Wed Apr 26 03:54:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.58 2017/04/24 23:01:45 chs Exp $ */
+/* $NetBSD: ppb.c,v 1.59 2017/04/26 03:54:37 msaitoh Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.58 2017/04/24 23:01:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.59 2017/04/26 03:54:37 msaitoh Exp $");
#include
#include
@@ -47,7 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.58
#define PCIE_SLCSR_NOTIFY_MASK \
(PCIE_SLCSR_ABE | PCIE_SLCSR_PFE | PCIE_SLCSR_MSE | \
- PCIE_SLCSR_PDE | PCIE_SLCSR_CCE | PCIE_SLCSR_HPE)
+ PCIE_SLCSR_PDE | PCIE_SLCSR_CCE | PCIE_SLCSR_HPE | \
+ PCIE_SLCSR_DLLSCE)
static const char pcie_linkspeed_strings[4][5] = {
"1.25", "2.5", "5.0", "8.0",
@@ -349,6 +350,7 @@ static int
ppbdetach(device_t self, int flags)
{
struct ppb_softc *sc = device_private(self);
+ pcireg_t slcsr;
int rc;
if ((rc = config_detach_children(self, flags)) != 0)
@@ -363,6 +365,19 @@ ppbdetach(device_t self, int flags)
evcnt_detach(&sc->sc_ev_cc);
evcnt_detach(&sc->sc_ev_lacs);
+ /* Clear any pending events and disable interrupt */
+ slcsr = pci_conf_read(sc->sc_pc, sc->sc_tag,
+ sc->sc_pciecapoff + PCIE_SLCSR);
+ slcsr &= ~PCIE_SLCSR_NOTIFY_MASK;
+ pci_conf_write(sc->sc_pc, sc->sc_tag,
+ sc->sc_pciecapoff + PCIE_SLCSR, slcsr);
+
+ /* Disestablish the interrupt handler */
+ if (sc->sc_intrhand != NULL) {
+ pci_intr_disestablish(sc->sc_pc, sc->sc_intrhand);
+ pci_intr_release(sc->sc_pc, sc->sc_pihp, 1);
+ }
+
pmf_device_deregister(self);
return 0;
}
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: knakahara
Date: Wed Apr 26 03:29:37 UTC 2017
Modified Files:
src/sys/opencrypto: crypto.c
Log Message:
When crypto request is deferred processing, opencrypto should not return error.
When the crypto device blocks a crypto request, opnecrypto enqueues the request,
that is, the request is just deferred and no error occurs.
The pseudo error causes problems, e.g. ipsec can send wrong ICMP host unreach.
contributed by hsuenaga@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/opencrypto/crypto.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/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.57 src/sys/opencrypto/crypto.c:1.58
--- src/sys/opencrypto/crypto.c:1.57 Mon Apr 24 03:29:37 2017
+++ src/sys/opencrypto/crypto.c Wed Apr 26 03:29:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.57 2017/04/24 03:29:37 knakahara Exp $ */
+/* $NetBSD: crypto.c,v 1.58 2017/04/26 03:29:36 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.57 2017/04/24 03:29:37 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.58 2017/04/26 03:29:36 knakahara Exp $");
#include
#include
@@ -774,6 +774,13 @@ crypto_dispatch(struct cryptop *crp)
TAILQ_INSERT_HEAD(&crp_q, crp, crp_next);
cryptostats.cs_blocks++;
mutex_spin_exit(&crypto_q_mtx);
+
+/*
+ * The crp is enqueued to crp_q, that is,
+ * no error occurs. So, this function should
+ * not return error.
+ */
+result = 0;
}
goto out_released;
} else {
@@ -836,6 +843,13 @@ crypto_kdispatch(struct cryptkop *krp)
TAILQ_INSERT_HEAD(&crp_kq, krp, krp_next);
cryptostats.cs_kblocks++;
mutex_spin_exit(&crypto_q_mtx);
+
+ /*
+ * The krp is enqueued to crp_kq, that is,
+ * no error occurs. So, this function should
+ * not return error.
+ */
+ result = 0;
}
} else {
/*
CVS commit: src/crypto/dist/ipsec-tools/src/libipsec
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 26 03:19:49 UTC 2017
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: pfkey_dump.c
Log Message:
Print protocol number as well as its name
ex.) before: "reserved" -> after: "255(reserved)"
The original author is hsuenaga@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.20 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.21
--- src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.20 Mon Jan 9 15:25:13 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c Wed Apr 26 03:19:49 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pfkey_dump.c,v 1.20 2012/01/09 15:25:13 drochner Exp $ */
+/* $NetBSD: pfkey_dump.c,v 1.21 2017/04/26 03:19:49 ozaki-r Exp $ */
/* $KAME: pfkey_dump.c,v 1.45 2003/09/08 10:14:56 itojun Exp $ */
@@ -761,7 +761,7 @@ str_upperspec(ulp, p1, p2)
ent = getprotobynumber((int)ulp);
if (ent)
- printf("%s", ent->p_name);
+ printf("%u(%s)", ulp, ent->p_name);
else
printf("%u", ulp);
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 26 03:16:06 UTC 2017
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: key_debug.c
src/sys/netipsec: key_debug.c
Log Message:
Correct the length of the SADB_EXT header in debug outputs
The length is shifted 3 bits in PF_KEY protocol.
Originally fixed by hsuenaga@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netipsec/key_debug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.10 src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.11
--- src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.10 Mon Jan 9 15:25:13 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c Wed Apr 26 03:16:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.10 2012/01/09 15:25:13 drochner Exp $ */
+/* $NetBSD: key_debug.c,v 1.11 2017/04/26 03:16:06 ozaki-r Exp $ */
/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
@@ -133,7 +133,7 @@ kdebug_sadb(base)
while (tlen > 0) {
printf("sadb_ext{ len=%u type=%u }\n",
- ext->sadb_ext_len, ext->sadb_ext_type);
+ PFKEY_UNUNIT64(ext->sadb_ext_len), ext->sadb_ext_type);
if (ext->sadb_ext_len == 0) {
printf("kdebug_sadb: invalid ext_len=0 was passed.\n");
Index: src/sys/netipsec/key_debug.c
diff -u src/sys/netipsec/key_debug.c:1.16 src/sys/netipsec/key_debug.c:1.17
--- src/sys/netipsec/key_debug.c:1.16 Tue Apr 18 10:49:35 2017
+++ src/sys/netipsec/key_debug.c Wed Apr 26 03:16:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.16 2017/04/18 10:49:35 ozaki-r Exp $ */
+/* $NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */
@@ -33,7 +33,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.16 2017/04/18 10:49:35 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.17 2017/04/26 03:16:06 ozaki-r Exp $");
#endif
#if defined(_KERNEL_OPT)
@@ -105,7 +105,7 @@ kdebug_sadb(const struct sadb_msg *base)
while (tlen > 0) {
printf("sadb_ext{ len=%u type=%u }\n",
- ext->sadb_ext_len, ext->sadb_ext_type);
+ PFKEY_UNUNIT64(ext->sadb_ext_len), ext->sadb_ext_type);
if (ext->sadb_ext_len == 0) {
printf("kdebug_sadb: invalid ext_len=0 was passed.\n");
CVS commit: src/sys
Module Name:src
Committed By: riastradh
Date: Wed Apr 26 03:04:25 UTC 2017
Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.97 -r1.98 src/sys/sys/vnode_if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.102 src/sys/kern/vnode_if.c:1.103
--- src/sys/kern/vnode_if.c:1.102 Sun Apr 16 17:18:55 2017
+++ src/sys/kern/vnode_if.c Wed Apr 26 03:04:24 2017
@@ -1,11 +1,11 @@
-/* $NetBSD: vnode_if.c,v 1.102 2017/04/16 17:18:55 riastradh Exp $ */
+/* $NetBSD: vnode_if.c,v 1.103 2017/04/26 03:04:24 riastradh Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
* (Modifications made here may easily be lost!)
*
* Created from the file:
- * NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ * NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
* by the script:
* NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
*/
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.102 2017/04/16 17:18:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.103 2017/04/26 03:04:24 riastradh Exp $");
#include
#include
@@ -777,18 +777,18 @@ VOP_SEEK(struct vnode *vp,
}
const int vop_remove_vp_offsets[] = {
- VOPARG_OFFSETOF(struct vop_remove_args,a_dvp),
- VOPARG_OFFSETOF(struct vop_remove_args,a_vp),
+ VOPARG_OFFSETOF(struct vop_remove_v2_args,a_dvp),
+ VOPARG_OFFSETOF(struct vop_remove_v2_args,a_vp),
VDESC_NO_OFFSET
};
const struct vnodeop_desc vop_remove_desc = {
VOP_REMOVE_DESCOFFSET,
"vop_remove",
- 0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT,
+ 0 | VDESC_VP1_WILLPUT,
vop_remove_vp_offsets,
VDESC_NO_OFFSET,
VDESC_NO_OFFSET,
- VOPARG_OFFSETOF(struct vop_remove_args, a_cnp),
+ VOPARG_OFFSETOF(struct vop_remove_v2_args, a_cnp),
};
int
VOP_REMOVE(struct vnode *dvp,
@@ -797,7 +797,7 @@ VOP_REMOVE(struct vnode *dvp,
{
int error;
bool mpsafe;
- struct vop_remove_args a;
+ struct vop_remove_v2_args a;
a.a_desc = VDESC(vop_remove);
a.a_dvp = dvp;
a.a_vp = vp;
@@ -926,18 +926,18 @@ VOP_MKDIR(struct vnode *dvp,
}
const int vop_rmdir_vp_offsets[] = {
- VOPARG_OFFSETOF(struct vop_rmdir_args,a_dvp),
- VOPARG_OFFSETOF(struct vop_rmdir_args,a_vp),
+ VOPARG_OFFSETOF(struct vop_rmdir_v2_args,a_dvp),
+ VOPARG_OFFSETOF(struct vop_rmdir_v2_args,a_vp),
VDESC_NO_OFFSET
};
const struct vnodeop_desc vop_rmdir_desc = {
VOP_RMDIR_DESCOFFSET,
"vop_rmdir",
- 0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT,
+ 0 | VDESC_VP1_WILLPUT,
vop_rmdir_vp_offsets,
VDESC_NO_OFFSET,
VDESC_NO_OFFSET,
- VOPARG_OFFSETOF(struct vop_rmdir_args, a_cnp),
+ VOPARG_OFFSETOF(struct vop_rmdir_v2_args, a_cnp),
};
int
VOP_RMDIR(struct vnode *dvp,
@@ -946,7 +946,7 @@ VOP_RMDIR(struct vnode *dvp,
{
int error;
bool mpsafe;
- struct vop_rmdir_args a;
+ struct vop_rmdir_v2_args a;
a.a_desc = VDESC(vop_rmdir);
a.a_dvp = dvp;
a.a_vp = vp;
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.26 src/sys/rump/include/rump/rumpvnode_if.h:1.27
--- src/sys/rump/include/rump/rumpvnode_if.h:1.26 Sun Apr 16 17:18:55 2017
+++ src/sys/rump/include/rump/rumpvnode_if.h Wed Apr 26 03:04:24 2017
@@ -1,11 +1,11 @@
-/* $NetBSD: rumpvnode_if.h,v 1.26 2017/04/16 17:18:55 riastradh Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.27 2017/04/26 03:04:24 riastradh Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
* (Modifications made here may easily be lost!)
*
* Created from the file:
- * NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ * NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
* by the script:
* NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
*/
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.26 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.27
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.26 Sun Apr 16 17:18:55 2017
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Wed Apr 26 03:04:24 2017
@@ -1,11 +1,11 @@
-/* $NetBSD: rumpvnode_if.c,v 1.26 2017/04/16 17:18:55 riastradh Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.27 2017/04/26 03:04:24 riastradh Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
* (Modifications made here may easily be lost!)
*
* Created from the file:
- * NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ * NetBSD: vnode_if.src,v 1.74 2017/04/2
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Wed Apr 26 03:02:49 UTC 2017
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
src/lib/libp2k: p2k.c
src/sys/coda: coda_vnops.c
src/sys/compat/svr4: svr4_stream.c
src/sys/fs/msdosfs: msdosfs_vnops.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/puffs: puffs_vnops.c
src/sys/fs/smbfs: smbfs_vnops.c
src/sys/fs/sysvbfs: sysvbfs_vnops.c
src/sys/fs/tmpfs: tmpfs_vnops.c
src/sys/fs/udf: udf_vnops.c
src/sys/fs/union: union_vnops.c
src/sys/fs/unionfs: unionfs_vnops.c
src/sys/fs/v7fs: v7fs_vnops.c
src/sys/kern: vfs_syscalls.c vnode_if.src
src/sys/miscfs/deadfs: dead_vnops.c
src/sys/miscfs/genfs: layer_vnops.c
src/sys/nfs: nfs_serv.c nfs_vnops.c
src/sys/rump/librump/rumpvfs: rumpfs.c
src/sys/ufs/chfs: chfs_vnops.c
src/sys/ufs/ext2fs: ext2fs_vnops.c
src/sys/ufs/lfs: lfs_vnops.c ulfs_vnops.c
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
Change VOP_REMOVE and VOP_RMDIR to preserve lock/ref on dvp.
No change to vp -- the plan is to replace the node by the
componentname in the vop parameters, and let all directory vops do
lookups internally.
Proposed on tech-kern with no objections:
https://mail-index.netbsd.org/tech-kern/2017/04/17/msg021825.html
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
cvs rdiff -u -r1.69 -r1.70 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.104 -r1.105 src/sys/coda/coda_vnops.c
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/svr4/svr4_stream.c
cvs rdiff -u -r1.97 -r1.98 src/sys/fs/msdosfs/msdosfs_vnops.c
cvs rdiff -u -r1.34 -r1.35 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.209 -r1.210 src/sys/fs/puffs/puffs_vnops.c
cvs rdiff -u -r1.93 -r1.94 src/sys/fs/smbfs/smbfs_vnops.c
cvs rdiff -u -r1.61 -r1.62 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.131 -r1.132 src/sys/fs/tmpfs/tmpfs_vnops.c
cvs rdiff -u -r1.103 -r1.104 src/sys/fs/udf/udf_vnops.c
cvs rdiff -u -r1.66 -r1.67 src/sys/fs/union/union_vnops.c
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/unionfs/unionfs_vnops.c
cvs rdiff -u -r1.24 -r1.25 src/sys/fs/v7fs/v7fs_vnops.c
cvs rdiff -u -r1.512 -r1.513 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/vnode_if.src
cvs rdiff -u -r1.60 -r1.61 src/sys/miscfs/deadfs/dead_vnops.c
cvs rdiff -u -r1.62 -r1.63 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.172 -r1.173 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.309 -r1.310 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.147 -r1.148 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.31 -r1.32 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.125 -r1.126 src/sys/ufs/ext2fs/ext2fs_vnops.c
cvs rdiff -u -r1.313 -r1.314 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.47 -r1.48 src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.236 -r1.237 src/sys/ufs/ufs/ufs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.24 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.25
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.24 Tue Apr 11 14:25:01 2017
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Wed Apr 26 03:02:47 2017
@@ -4975,7 +4975,7 @@ zfs_netbsd_create(void *v)
static int
zfs_netbsd_remove(void *v)
{
- struct vop_remove_args /* {
+ struct vop_remove_v2_args /* {
struct vnode *a_dvp;
struct vnode *a_vp;
struct componentname *a_cnp;
@@ -5002,13 +5002,6 @@ zfs_netbsd_remove(void *v)
0);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-
- /*
- * Unlock and release dvp because the VOP_REMOVE protocol is insane.
- */
- VOP_UNLOCK(dvp);
- VN_RELE(dvp);
-
return (error);
}
@@ -5048,7 +5041,7 @@ zfs_netbsd_mkdir(void *v)
static int
zfs_netbsd_rmdir(void *v)
{
- struct vop_rmdir_args /* {
+ struct vop_rmdir_v2_args /* {
struct vnode *a_dvp;
struct vnode *a_vp;
struct componentname *a_cnp;
@@ -5075,12 +5068,6 @@ zfs_netbsd_rmdir(void *v)
NULL, 0);
KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-
- /*
- * Unlock and release dvp because the VOP_RMDIR protocol is insane.
- */
- VOP_UNLOCK(dvp);
- VN_RELE(dvp);
return error;
}
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.69 src/lib/libp2k/p2k.c:1.70
--- src/lib/libp2k/p2k.c:1.69 Tue Apr 11 14:25:02 2017
+++ src/lib/libp2k/p2k.c Wed Apr 26 03:02:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.69 2017/04/11 14:25:02 riastradh Exp $ */
+/* $NetBSD: p2k.c,v 1.70 2017/04/26 03:02:48 riastradh Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -1026,8 +1026,11 @@ do_nukenode(struct p2k_node *p2n_dir, st
RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
CVS commit: [pgoyette-localcount] src/sys
Module Name:src Committed By: pgoyette Date: Wed Apr 26 02:57:17 UTC 2017 Modified Files: src/sys/arch/sh3/include [pgoyette-localcount]: ieeefp.h src/sys/dev/pci [pgoyette-localcount]: piixpm.c Log Message: Resolve a couple of conflicts To generate a diff of this commit: cvs rdiff -u -r1.4.62.1 -r1.4.62.2 src/sys/arch/sh3/include/ieeefp.h cvs rdiff -u -r1.49.2.3 -r1.49.2.4 src/sys/dev/pci/piixpm.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/sh3/include/ieeefp.h diff -u src/sys/arch/sh3/include/ieeefp.h:1.4.62.1 src/sys/arch/sh3/include/ieeefp.h:1.4.62.2 --- src/sys/arch/sh3/include/ieeefp.h:1.4.62.1 Wed Apr 26 02:53:07 2017 +++ src/sys/arch/sh3/include/ieeefp.h Wed Apr 26 02:57:17 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ieeefp.h,v 1.4.62.1 2017/04/26 02:53:07 pgoyette Exp $ */ +/* $NetBSD: ieeefp.h,v 1.4.62.2 2017/04/26 02:57:17 pgoyette Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -32,14 +32,11 @@ typedef int fexcept_t; #if defined(_NETBSD_SOURCE) typedef int fp_except; -<<< ieeefp.h -=== #ifdef __SH_FPU_ANY__ /* hardfloat */ ->>> 1.7 #define FP_X_INV FE_INVALID /* invalid operation exception */ #define FP_X_DNML FE_DENORMAL /* denormalization exception */ #define FP_X_DZ FE_DIVBYZERO /* divide-by-zero exception */ Index: src/sys/dev/pci/piixpm.c diff -u src/sys/dev/pci/piixpm.c:1.49.2.3 src/sys/dev/pci/piixpm.c:1.49.2.4 --- src/sys/dev/pci/piixpm.c:1.49.2.3 Wed Apr 26 02:53:22 2017 +++ src/sys/dev/pci/piixpm.c Wed Apr 26 02:57:17 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $ */ +/* $NetBSD: piixpm.c,v 1.49.2.4 2017/04/26 02:57:17 pgoyette Exp $ */ /* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */ /* @@ -22,11 +22,7 @@ */ #include -<<< piixpm.c -__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $"); -=== -__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.3 2017/04/26 02:53:22 pgoyette Exp $"); ->>> 1.52 +__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.49.2.4 2017/04/26 02:57:17 pgoyette Exp $"); #include #include
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Wed Apr 26 01:51:53 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: TEGRA
src/sys/dev/fdt: fdtbus.c fdtvar.h files.fdt
Log Message:
Allow for specifying (optional) pass number locator for devices at fdt.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/TEGRA
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/fdt/files.fdt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.17 src/sys/arch/evbarm/conf/TEGRA:1.18
--- src/sys/arch/evbarm/conf/TEGRA:1.17 Sat Apr 22 23:53:24 2017
+++ src/sys/arch/evbarm/conf/TEGRA Wed Apr 26 01:51:52 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: TEGRA,v 1.17 2017/04/22 23:53:24 jmcneill Exp $
+# $NetBSD: TEGRA,v 1.18 2017/04/26 01:51:52 jmcneill Exp $
#
# NVIDIA Tegra K1 (T124)
#
@@ -42,28 +42,28 @@ fdt* at fdtbus?
# CPU frequency scaling
tegra124cpu* at fdt?
-fclock* at fdt?
-fregulator* at fdt?
+fclock* at fdt? pass 4
+fregulator* at fdt? pass 4
gpiokeys* at fdt?
# Interrupt controller
-tegralic* at fdt? # LIC
-gic* at fdt? # GIC
+tegralic* at fdt? pass 1 # LIC
+gic* at fdt? pass 1 # GIC
# Memory controller
-tegramc* at fdt? # MC
+tegramc* at fdt? pass 4 # MC
# FUSE controller
-tegrafuse* at fdt? # FUSE
+tegrafuse* at fdt? pass 4 # FUSE
# Power management controller
-tegrapmc* at fdt? # PMC
+tegrapmc* at fdt? pass 4 # PMC
# Clock and Reset controller
-tegra124car* at fdt? # CAR
+tegra124car* at fdt? pass 3 # CAR
# GPIO controller
-tegragpio* at fdt? # GPIO
+tegragpio* at fdt? pass 2 # GPIO
gpio* at gpiobus?
# Timers
Index: src/sys/dev/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.8 src/sys/dev/fdt/fdtbus.c:1.9
--- src/sys/dev/fdt/fdtbus.c:1.8 Sun Apr 16 12:24:57 2017
+++ src/sys/dev/fdt/fdtbus.c Wed Apr 26 01:51:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.8 2017/04/16 12:24:57 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.9 2017/04/26 01:51:52 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.8 2017/04/16 12:24:57 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.9 2017/04/26 01:51:52 jmcneill Exp $");
#include
#include
@@ -40,6 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1
#include
+#include "locators.h"
+
#define FDT_MAX_PATH 256
struct fdt_node {
@@ -64,8 +66,9 @@ struct fdt_softc {
static int fdt_match(device_t, cfdata_t, void *);
static void fdt_attach(device_t, device_t, void *);
+static int fdt_scan_submatch(device_t, cfdata_t, const int *, void *);
static void fdt_scan_bus(struct fdt_softc *);
-static void fdt_scan(struct fdt_softc *);
+static void fdt_scan(struct fdt_softc *, int);
static void fdt_add_node(struct fdt_node *);
static u_int fdt_get_order(int);
@@ -159,17 +162,31 @@ fdt_attach(device_t parent, device_t sel
if (OF_finddevice("/") != faa->faa_phandle)
return;
+ aprint_debug_dev(sc->sc_dev, " order phandle buspath\n");
+ aprint_debug_dev(sc->sc_dev, " = === ===\n");
+ TAILQ_FOREACH(node, &fdt_nodes, n_nodes) {
+ char buf[FDT_MAX_PATH];
+ const char *path = buf;
+ if (!fdtbus_get_path(node->n_phandle, buf, sizeof(buf)))
+ path = node->n_name;
+ aprint_debug_dev(sc->sc_dev, " %04x 0x%04x%s %s\n",
+ node->n_order & 0x, node->n_phandle,
+ device_xname(node->n_bus), path);
+ }
+
/* Scan devices */
- fdt_scan(sc);
+ for (int pass = 1; pass <= FDTCF_PASS_DEFAULT; pass++)
+ fdt_scan(sc, pass);
}
static void
fdt_init_attach_args(struct fdt_softc *sc, struct fdt_node *node,
-struct fdt_attach_args *faa)
+bool quiet, struct fdt_attach_args *faa)
{
*faa = sc->sc_faa;
faa->faa_phandle = node->n_phandle;
faa->faa_name = node->n_name;
+ faa->faa_quiet = quiet;
}
static void
@@ -185,7 +202,7 @@ fdt_scan_bus(struct fdt_softc *sc)
if (node->n_dev != NULL)
continue;
- fdt_init_attach_args(sc, node, &faa);
+ fdt_init_attach_args(sc, node, true, &faa);
/*
* Only attach busses to nodes where this driver is the best
@@ -202,22 +219,37 @@ fdt_scan_bus(struct fdt_softc *sc)
}
}
+static int
+fdt_scan_submatch(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
+ if (locs[FDTCF_PASS] != FDTCF_PASS_DEFAULT &&
+ locs[FDTCF_PASS] != cf->cf_loc[FDTCF_PASS])
+ return 0;
+
+ return config_stdsubmatch(parent, cf, locs, aux);
+}
+
static void
-fdt_scan(struct fdt_softc *sc)
+fdt_scan(struct fdt_softc *sc, int pass)
{
struct fdt_node *node;
struct fdt_attach_args faa;
+ const int locs[FDTCF_NLOCS] = {
+ [FDTCF_PASS] = pass
+ };
+ bool quiet = pass != FDTCF_PASS_DEFAULT;
TAILQ_FOREACH(node, &fdt_nodes, n_n
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed Apr 26 01:43:00 UTC 2017
Modified Files:
src/sys/arch/arm/nvidia: tegra124_car.c
Log Message:
Set host1x parent to pll_p_out0
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra124_car.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra124_car.c
diff -u src/sys/arch/arm/nvidia/tegra124_car.c:1.11 src/sys/arch/arm/nvidia/tegra124_car.c:1.12
--- src/sys/arch/arm/nvidia/tegra124_car.c:1.11 Sat Apr 22 17:40:47 2017
+++ src/sys/arch/arm/nvidia/tegra124_car.c Wed Apr 26 01:43:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra124_car.c,v 1.11 2017/04/22 17:40:47 jmcneill Exp $ */
+/* $NetBSD: tegra124_car.c,v 1.12 2017/04/26 01:43:00 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.11 2017/04/22 17:40:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra124_car.c,v 1.12 2017/04/26 01:43:00 jmcneill Exp $");
#include
#include
@@ -651,6 +651,7 @@ struct tegra124_init_parent {
{ "xusb_falcon_src", "pll_p_out0" },
{ "xusb_ss_src", "pll_u_480" },
{ "xusb_fs_src", "pll_u_48" },
+ { "host1x", "pll_p_out0" },
};
struct tegra124_car_rst {
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Wed Apr 26 01:42:46 UTC 2017
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm_mode.c
Log Message:
Ignore dc parent clock from devicetree and use hdmi parent for dc.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_drm_mode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm_mode.c
diff -u src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.13 src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.14
--- src/sys/arch/arm/nvidia/tegra_drm_mode.c:1.13 Sun Apr 16 12:22:18 2017
+++ src/sys/arch/arm/nvidia/tegra_drm_mode.c Wed Apr 26 01:42:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.13 2017/04/16 12:22:18 jmcneill Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.14 2017/04/26 01:42:46 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.13 2017/04/16 12:22:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.14 2017/04/26 01:42:46 jmcneill Exp $");
#include
#include
@@ -290,7 +290,7 @@ tegra_crtc_init(struct drm_device *ddev,
int error;
if (sc->sc_clk_dc[index] == NULL ||
- sc->sc_clk_dc_parent[index] == NULL ||
+ sc->sc_clk_hdmi_parent == NULL ||
sc->sc_rst_dc[index] == NULL) {
DRM_ERROR("no clocks configured for crtc %d\n", index);
return -EIO;
@@ -344,9 +344,9 @@ tegra_crtc_init(struct drm_device *ddev,
tegra_pmc_power(pmc_partid, true);
tegra_pmc_remove_clamping(pmc_partid);
- /* Set parent clock */
+ /* Set parent clock to the HDMI parent (ignoring DC parent in DT!) */
error = clk_set_parent(sc->sc_clk_dc[index],
- sc->sc_clk_dc_parent[index]);
+ sc->sc_clk_hdmi_parent);
if (error) {
DRM_ERROR("failed to set crtc %d clock parent: %d\n",
index, error);
@@ -363,7 +363,7 @@ tegra_crtc_init(struct drm_device *ddev,
/* Leave reset */
fdtbus_reset_deassert(sc->sc_rst_dc[index]);
- crtc->clk_parent = sc->sc_clk_dc_parent[index];
+ crtc->clk_parent = sc->sc_clk_hdmi_parent;
DC_WRITE(crtc, DC_CMD_INT_ENABLE_REG, DC_CMD_INT_V_BLANK);
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Tue Apr 25 22:15:57 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.89 src/doc/CHANGES-6.0.7:1.1.2.90 --- src/doc/CHANGES-6.0.7:1.1.2.89 Sat Mar 25 17:20:29 2017 +++ src/doc/CHANGES-6.0.7 Tue Apr 25 22:15:57 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.89 2017/03/25 17:20:29 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.90 2017/04/25 22:15:57 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -10381,3 +10381,1385 @@ sys/arch/i386/i386/trap.c 1.287 Handle #SS faults on iret properly. [maxv, ticket #1446] +external/bsd/bind/Makefile.inc patch +external/bsd/bind/bin/dnssec/Makefile patch +external/bsd/bind/bin/dnssec/dnssec-verify/Makefile patch +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/COPYRIGHT patch +external/bsd/bind/dist/FAQ patch +external/bsd/bind/dist/FAQ.xml patch +external/bsd/bind/dist/Makefile.in patch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/acconfig.h patch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/check/named-checkconf.8 patch +external/bsd/bind/dist/bin/check/named-checkconf.c patch +external/bsd/bind/dist/bin/check/named-checkconf.docbook patch +external/bsd/bind/dist/bin/check/named-checkconf.html patch +external/bsd/bind/dist/bin/check/named-checkzone.8 patch +external/bsd/bind/dist/bin/check/named-checkzone.c patch +external/bsd/bind/dist/bin/check/named-checkzone.docbook patch +external/bsd/bind/dist/bin/check/named-checkzone.html patch +external/bsd/bind/dist/bin/confgen/Makefile.in patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.8 patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.c patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.html patch +external/bsd/bind/dist/bin/confgen/keygen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.8 patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.html patch +external/bsd/bind/dist/bin/confgen/util.c patch +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/dig.1 patch +external/bsd/bind/dist/bin/dig/dig.c patch +external/bsd/bind/dist/bin/dig/dig.docbook patch +external/bsd/bind/dist/bin/dig/dig.html patch +external/bsd/bind/dist/bin/dig/dighost.c patch +external/bsd/bind/dist/bin/dig/host.1 patch +external/bsd/bind/dist/bin/dig/host.c patch +external/bsd/bind/dist/bin/dig/host.docbook patch +external/bsd/bind/dist/bin/dig/host.html patch +external/bsd/bind/dist/bin/dig/include/dig/dig.h patch +external/bsd/bind/dist/bin/dig/nslookup.1 patch +external/bsd/bind/dist/bin/dig/nslookup.c patch +external/bsd/bind/dist/bin/dig/nslookup.docbook patch +external/bsd/bind/dist/bin/dig/nslookup.html patch +external/bsd/bind/dist/bin/dnssec/Makefile.in patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c patch +external/bs
CVS commit: src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 22:07:10 UTC 2017
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
Add a check to ensure that a new sysctl node was attached in the tree
at the place we expected it to be attached!
As mentioned several times (on tech-kern@ mailing list) over the past
18 months or so, I've seen a few instances where this will trigger,
although I've been unable to reproduce them. Hopefully some wider
exposure will reveal the under-lying cause of this rare phenomenon.
Commit was proposed on tech-kern list, and no objections raised.
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/kern/kern_sysctl.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_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.258 src/sys/kern/kern_sysctl.c:1.259
--- src/sys/kern/kern_sysctl.c:1.258 Fri Oct 23 01:58:43 2015
+++ src/sys/kern/kern_sysctl.c Tue Apr 25 22:07:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.258 2015/10/23 01:58:43 pgoyette Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.259 2017/04/25 22:07:10 pgoyette Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.258 2015/10/23 01:58:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.259 2017/04/25 22:07:10 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -1955,6 +1955,7 @@ sysctl_createv(struct sysctllog **log, i
const struct sysctlnode *root, *pnode;
struct sysctlnode nnode, onode, *dnode;
size_t sz;
+ const struct sysctlnode *snode __diagused;
/*
* where are we putting this?
@@ -2111,6 +2112,7 @@ sysctl_createv(struct sysctllog **log, i
*/
pnode = root;
error = sysctl_locate(NULL, &name[0], namelen - 1, &pnode, &ni);
+ snode = pnode;
/*
* manual scan of last layer so that aliased nodes
@@ -2131,6 +2133,8 @@ sysctl_createv(struct sysctllog **log, i
* not expecting an error here, but...
*/
if (error == 0) {
+ KASSERTMSG(pnode->sysctl_parent == snode,
+ "sysctl parent mis-match");
if (log != NULL)
sysctl_log_add(log, pnode);
if (cnode != NULL)
CVS commit: [pgoyette-localcount] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 21:53:06 UTC 2017
Modified Files:
src/sys/kern [pgoyette-localcount]: subr_devsw.c
Log Message:
Use {b,c}devsw_acquire() and {b,c}devsw_release() in the various device
acccess methods.
To generate a diff of this commit:
cvs rdiff -u -r1.34.2.16 -r1.34.2.17 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.34.2.16 src/sys/kern/subr_devsw.c:1.34.2.17
--- src/sys/kern/subr_devsw.c:1.34.2.16 Tue Apr 25 21:36:41 2017
+++ src/sys/kern/subr_devsw.c Tue Apr 25 21:53:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34.2.17 2017/04/25 21:53:06 pgoyette Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.17 2017/04/25 21:53:06 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -877,7 +877,7 @@ bdev_open(dev_t dev, int flag, int devty
* with attach/detach.
*/
mutex_enter(&device_lock);
- d = bdevsw_lookup(dev);
+ d = bdevsw_lookup_acquire(dev);
mutex_exit(&device_lock);
if (d == NULL)
return ENXIO;
@@ -885,6 +885,7 @@ bdev_open(dev_t dev, int flag, int devty
DEV_LOCK(d);
rv = (*d->d_open)(dev, flag, devtype, l);
DEV_UNLOCK(d);
+ bdevsw_release(dev);
return rv;
}
@@ -895,12 +896,13 @@ bdev_close(dev_t dev, int flag, int devt
const struct bdevsw *d;
int rv, mpflag;
- if ((d = bdevsw_lookup(dev)) == NULL)
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL)
return ENXIO;
DEV_LOCK(d);
rv = (*d->d_close)(dev, flag, devtype, l);
DEV_UNLOCK(d);
+ bdevsw_release(dev);
return rv;
}
@@ -916,7 +918,7 @@ bdev_strategy(struct buf *bp)
SDT_PROBE1(io, kernel, , start, bp);
- if ((d = bdevsw_lookup(bp->b_dev)) == NULL) {
+ if ((d = bdevsw_lookup_acquire(bp->b_dev)) == NULL) {
bp->b_error = ENXIO;
bp->b_resid = bp->b_bcount;
biodone_vfs(bp); /* biodone() iff vfs present */
@@ -926,6 +928,7 @@ bdev_strategy(struct buf *bp)
DEV_LOCK(d);
(*d->d_strategy)(bp);
DEV_UNLOCK(d);
+ bdevsw_release(bp->b_dev);
}
int
@@ -934,12 +937,13 @@ bdev_ioctl(dev_t dev, u_long cmd, void *
const struct bdevsw *d;
int rv, mpflag;
- if ((d = bdevsw_lookup(dev)) == NULL)
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL)
return ENXIO;
DEV_LOCK(d);
rv = (*d->d_ioctl)(dev, cmd, data, flag, l);
DEV_UNLOCK(d);
+ bdevsw_release(dev);
return rv;
}
@@ -969,20 +973,28 @@ int
bdev_flags(dev_t dev)
{
const struct bdevsw *d;
+ int rv;
- if ((d = bdevsw_lookup(dev)) == NULL)
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL)
return 0;
- return d->d_flag & ~D_TYPEMASK;
+ rv = d->d_flag & ~D_TYPEMASK;
+ bdevsw_release();
+
+ return rv;
}
int
bdev_type(dev_t dev)
{
const struct bdevsw *d;
+ int rv;
- if ((d = bdevsw_lookup(dev)) == NULL)
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL)
return D_OTHER;
- return d->d_flag & D_TYPEMASK;
+ rv = d->d_flag & D_TYPEMASK;
+ bdevsw_release(dev);
+
+ return rv;
}
int
@@ -991,7 +1003,7 @@ bdev_size(dev_t dev)
const struct bdevsw *d;
int rv, mpflag = 0;
- if ((d = bdevsw_lookup(dev)) == NULL ||
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL ||
d->d_psize == NULL)
return -1;
@@ -1004,7 +1016,7 @@ bdev_size(dev_t dev)
rv = (*d->d_psize)(dev);
if ((boothowto & RB_DUMP) == 0)
DEV_UNLOCK(d);
-
+ bdevsw_release(dev);
return rv;
}
@@ -1014,12 +1026,13 @@ bdev_discard(dev_t dev, off_t pos, off_t
const struct bdevsw *d;
int rv, mpflag;
- if ((d = bdevsw_lookup(dev)) == NULL)
+ if ((d = bdevsw_lookup_acquire(dev)) == NULL)
return ENXIO;
DEV_LOCK(d);
rv = (*d->d_discard)(dev, pos, len);
DEV_UNLOCK(d);
+ bdevsw_release(dev);
return rv;
}
@@ -1035,7 +1048,7 @@ cdev_open(dev_t dev, int flag, int devty
* with attach/detach.
*/
mutex_enter(&device_lock);
- d = cdevsw_lookup(dev);
+ d = cdevsw_lookup_acquire(dev);
mutex_exit(&device_lock);
if (d == NULL)
return ENXIO;
@@ -1043,6 +1056,7 @@ cdev_open(dev_t dev, int flag, int devty
DEV_LOCK(d);
rv = (*d->d_open)(dev, flag, devtype, l);
DEV_UNLOCK(d);
+ cdevsw_release(dev);
return rv;
}
@@ -1053,12 +1067,13 @@ cdev_close(dev_t dev, int flag, int devt
const struct cdevsw *d;
int rv, mpflag;
- if ((d = cdevsw_lookup(dev)) == NULL)
+ if ((d = cdevsw_lookup_acquire(dev)) == NULL)
return ENXIO;
DEV_LOCK(d);
rv = (*d->d_close)(dev, flag, devtype, l);
DEV_UNLOCK(d);
+ cdevsw_release(dev);
return rv;
}
@@ -1069,12 +1084,13 @@ cdev_read(dev_t dev, struct uio *uio, in
const struct cdevsw *d;
int rv, mpflag;
- if ((d = cdevsw_lookup(dev)) == NULL)
+
CVS commit: [pgoyette-localcount] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 21:36:41 UTC 2017
Modified Files:
src/sys/kern [pgoyette-localcount]: subr_devsw.c
Log Message:
Add membar_datadep_consumer() to {b,c}devsw_lookup() to ensure that
the devsw content is visible.
Again, thanks riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.34.2.15 -r1.34.2.16 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.34.2.15 src/sys/kern/subr_devsw.c:1.34.2.16
--- src/sys/kern/subr_devsw.c:1.34.2.15 Tue Apr 25 21:31:33 2017
+++ src/sys/kern/subr_devsw.c Tue Apr 25 21:36:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -452,6 +452,9 @@ bdevsw_lookup(dev_t dev)
if (bmajor < 0 || bmajor >= max_bdevsws)
return (NULL);
+ /* Wait for the content of the struct bdevsw to become visible */
+ membar_datadep_consumer();
+
return (bdevsw[bmajor]);
}
@@ -513,6 +516,9 @@ cdevsw_lookup(dev_t dev)
if (cmajor < 0 || cmajor >= max_cdevsws)
return (NULL);
+ /* Wait for the content of the struct bdevsw to become visible */
+ membar_datadep_consumer();
+
return (cdevsw[cmajor]);
}
CVS commit: [pgoyette-localcount] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 21:31:33 UTC 2017
Modified Files:
src/sys/kern [pgoyette-localcount]: subr_devsw.c
Log Message:
Call localcount_init() before publishing the new {b,c}devsw.
Thanks to riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.34.2.14 -r1.34.2.15 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.34.2.14 src/sys/kern/subr_devsw.c:1.34.2.15
--- src/sys/kern/subr_devsw.c:1.34.2.14 Sat Jan 7 08:56:49 2017
+++ src/sys/kern/subr_devsw.c Tue Apr 25 21:31:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.34.2.14 2017/01/07 08:56:49 pgoyette Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.14 2017/01/07 08:56:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -300,13 +300,14 @@ bdevsw_attach(const struct bdevsw *devsw
if (bdevsw[*devmajor] != NULL)
return (EEXIST);
+ KASSERTMSG(devsw->d_localcount != NULL, "%s: bdev for major %d has "
+ "no localcount", __func__, *devmajor);
+ localcount_init(devsw->d_localcount);
+
/* ensure visibility of the bdevsw */
membar_producer();
bdevsw[*devmajor] = devsw;
- KASSERTMSG(devsw->d_localcount != NULL, "%s: bdev for major %d has "
- "no localcount", __func__, *devmajor);
- localcount_init(devsw->d_localcount);
return (0);
}
@@ -353,13 +354,14 @@ cdevsw_attach(const struct cdevsw *devsw
if (cdevsw[*devmajor] != NULL)
return (EEXIST);
+ KASSERTMSG(devsw->d_localcount != NULL, "%s: cdev for major %d has "
+ "no localcount", __func__, *devmajor);
+ localcount_init(devsw->d_localcount);
+
/* ensure visibility of the cdevsw */
membar_producer();
cdevsw[*devmajor] = devsw;
- KASSERTMSG(devsw->d_localcount != NULL, "%s: cdev for major %d has "
- "no localcount", __func__, *devmajor);
- localcount_init(devsw->d_localcount);
return (0);
}
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Tue Apr 25 21:01:03 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-6.1.6 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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.87 src/doc/CHANGES-6.1.6:1.1.2.88 --- src/doc/CHANGES-6.1.6:1.1.2.87 Sat Mar 25 17:19:47 2017 +++ src/doc/CHANGES-6.1.6 Tue Apr 25 21:01:03 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.87 2017/03/25 17:19:47 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.88 2017/04/25 21:01:03 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -10101,3 +10101,1364 @@ sys/arch/i386/i386/trap.c 1.287 Handle #SS faults on iret properly. [maxv, ticket #1446] +external/bsd/bind/Makefile.inc patch +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/COPYRIGHT patch +external/bsd/bind/dist/FAQ patch +external/bsd/bind/dist/FAQ.xml patch +external/bsd/bind/dist/Makefile.in patch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/acconfig.h patch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/check/named-checkconf.8 patch +external/bsd/bind/dist/bin/check/named-checkconf.c patch +external/bsd/bind/dist/bin/check/named-checkconf.docbook patch +external/bsd/bind/dist/bin/check/named-checkconf.html patch +external/bsd/bind/dist/bin/check/named-checkzone.8 patch +external/bsd/bind/dist/bin/check/named-checkzone.c patch +external/bsd/bind/dist/bin/check/named-checkzone.docbook patch +external/bsd/bind/dist/bin/check/named-checkzone.html patch +external/bsd/bind/dist/bin/confgen/Makefile.in patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.8 patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.c patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.html patch +external/bsd/bind/dist/bin/confgen/keygen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.8 patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.html patch +external/bsd/bind/dist/bin/confgen/util.c patch +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/dig.1 patch +external/bsd/bind/dist/bin/dig/dig.c patch +external/bsd/bind/dist/bin/dig/dig.docbook patch +external/bsd/bind/dist/bin/dig/dig.html patch +external/bsd/bind/dist/bin/dig/dighost.c patch +external/bsd/bind/dist/bin/dig/host.1 patch +external/bsd/bind/dist/bin/dig/host.c patch +external/bsd/bind/dist/bin/dig/host.docbook patch +external/bsd/bind/dist/bin/dig/host.html patch +external/bsd/bind/dist/bin/dig/include/dig/dig.h patch +external/bsd/bind/dist/bin/dig/nslookup.1 patch +external/bsd/bind/dist/bin/dig/nslookup.c patch +external/bsd/bind/dist/bin/dig/nslookup.docbook patch +external/bsd/bind/dist/bin/dig/nslookup.html patch +external/bsd/bind/dist/bin/dnssec/Makefile.in patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.h
CVS commit: [jdolecek-ncq] src/sys/dev/ic
Module Name:src
Committed By: jdolecek
Date: Tue Apr 25 20:55:05 UTC 2017
Modified Files:
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c
Log Message:
make compile without DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.57.6.11 -r1.57.6.12 src/sys/dev/ic/ahcisata_core.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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.57.6.11 src/sys/dev/ic/ahcisata_core.c:1.57.6.12
--- src/sys/dev/ic/ahcisata_core.c:1.57.6.11 Mon Apr 24 18:22:31 2017
+++ src/sys/dev/ic/ahcisata_core.c Tue Apr 25 20:55:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.57.6.11 2017/04/24 18:22:31 jdolecek Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.57.6.12 2017/04/25 20:55:05 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.57.6.11 2017/04/24 18:22:31 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.57.6.12 2017/04/25 20:55:05 jdolecek Exp $");
#include
#include
@@ -1429,7 +1429,7 @@ ahci_timeout(void *v)
{
struct ata_xfer *xfer = v;
struct ata_channel *chp = xfer->c_chp;
- struct ahci_channel *achp = (struct ahci_channel *)chp;
+ struct ahci_channel *achp __diagused = (struct ahci_channel *)chp;
struct ahci_softc *sc = (struct ahci_softc *)chp->ch_atac;
int s;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Tue Apr 25 20:04:21 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.280 -r1.1.2.281 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.280 src/doc/CHANGES-6.2:1.1.2.281 --- src/doc/CHANGES-6.2:1.1.2.280 Sat Mar 25 17:58:44 2017 +++ src/doc/CHANGES-6.2 Tue Apr 25 20:04:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.280 2017/03/25 17:58:44 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.281 2017/04/25 20:04:21 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -16482,3 +16482,936 @@ bin/cat/cat.c 1.57 PR bin/51250. [sevan, ticket #1387] +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/COPYRIGHT patch +external/bsd/bind/dist/FAQ patch +external/bsd/bind/dist/FAQ.xml patch +external/bsd/bind/dist/Makefile.in patch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/acconfig.h patch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/check/named-checkconf.8 patch +external/bsd/bind/dist/bin/check/named-checkconf.c patch +external/bsd/bind/dist/bin/check/named-checkconf.docbook patch +external/bsd/bind/dist/bin/check/named-checkconf.html patch +external/bsd/bind/dist/bin/check/named-checkzone.8 patch +external/bsd/bind/dist/bin/check/named-checkzone.c patch +external/bsd/bind/dist/bin/check/named-checkzone.docbook patch +external/bsd/bind/dist/bin/check/named-checkzone.html patch +external/bsd/bind/dist/bin/confgen/Makefile.in patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.8 patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.html patch +external/bsd/bind/dist/bin/confgen/keygen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.8 patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.html patch +external/bsd/bind/dist/bin/confgen/util.c patch +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/dig.1 patch +external/bsd/bind/dist/bin/dig/dig.c patch +external/bsd/bind/dist/bin/dig/dig.docbook patch +external/bsd/bind/dist/bin/dig/dig.html patch +external/bsd/bind/dist/bin/dig/dighost.c patch +external/bsd/bind/dist/bin/dig/host.1 patch +external/bsd/bind/dist/bin/dig/host.docbook patch +external/bsd/bind/dist/bin/dig/host.html patch +external/bsd/bind/dist/bin/dig/nslookup.1 patch +external/bsd/bind/dist/bin/dig/nslookup.c patch +external/bsd/bind/dist/bin/dig/nslookup.docbook patch +external/bsd/bind/dist/bin/dig/nslookup.html patch +external/bsd/bind/dist/bin/dnssec/Makefile.in patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-importkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-revoke.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.html patch +external/bsd/bind/dist/bin/named/Makefile.in patch +external/bsd/bind/dist/bin/named/bind.keys.h patch +external/bsd/bind/dist/bin/named/client.c patch +external/bsd/bind/dist/bin/named/config.c patch +external/bsd/bind/dist/bin/named/control.c pat
CVS commit: [netbsd-6] src/external/bsd/bind
Module Name:src Committed By: snj Date: Tue Apr 25 19:54:35 UTC 2017 Modified Files: src/external/bsd/bind/dist [netbsd-6]: CHANGES COPYRIGHT FAQ FAQ.xml Makefile.in README acconfig.h bind.keys config.h.in config.h.win32 configure configure.in isc-config.sh.1 isc-config.sh.docbook isc-config.sh.html isc-config.sh.in srcid version src/external/bsd/bind/dist/bin/check [netbsd-6]: Makefile.in check-tool.c named-checkconf.8 named-checkconf.c named-checkconf.docbook named-checkconf.html named-checkzone.8 named-checkzone.c named-checkzone.docbook named-checkzone.html src/external/bsd/bind/dist/bin/confgen [netbsd-6]: Makefile.in ddns-confgen.8 ddns-confgen.docbook ddns-confgen.html keygen.c rndc-confgen.8 rndc-confgen.docbook rndc-confgen.html util.c src/external/bsd/bind/dist/bin/dig [netbsd-6]: Makefile.in dig.1 dig.c dig.docbook dig.html dighost.c host.1 host.docbook host.html nslookup.1 nslookup.c nslookup.docbook nslookup.html src/external/bsd/bind/dist/bin/dnssec [netbsd-6]: Makefile.in dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-dsfromkey.docbook dnssec-dsfromkey.html dnssec-importkey.8 dnssec-importkey.docbook dnssec-importkey.html dnssec-keyfromlabel.8 dnssec-keyfromlabel.docbook dnssec-keyfromlabel.html dnssec-keygen.8 dnssec-keygen.c dnssec-keygen.docbook dnssec-keygen.html dnssec-revoke.8 dnssec-revoke.c dnssec-revoke.docbook dnssec-revoke.html dnssec-settime.8 dnssec-settime.c dnssec-settime.docbook dnssec-settime.html dnssec-signzone.8 dnssec-signzone.c dnssec-signzone.docbook dnssec-signzone.html dnssec-verify.8 dnssec-verify.docbook dnssec-verify.html src/external/bsd/bind/dist/bin/named [netbsd-6]: Makefile.in bind.keys.h client.c config.c control.c controlconf.c interfacemgr.c logconf.c lwdclient.c lwdgrbn.c lwresd.8 lwresd.c lwresd.docbook lwresd.html main.c named.8 named.conf.5 named.conf.docbook named.conf.html named.docbook named.html query.c server.c statschannel.c update.c xfrout.c src/external/bsd/bind/dist/bin/named/include/named [netbsd-6]: log.h lwdclient.h main.h query.h server.h src/external/bsd/bind/dist/bin/named/unix [netbsd-6]: os.c src/external/bsd/bind/dist/bin/named/unix/include/named [netbsd-6]: os.h src/external/bsd/bind/dist/bin/nsupdate [netbsd-6]: Makefile.in nsupdate.1 nsupdate.c nsupdate.docbook nsupdate.html src/external/bsd/bind/dist/bin/pkcs11 [netbsd-6]: pkcs11-destroy.8 pkcs11-destroy.c pkcs11-destroy.docbook pkcs11-destroy.html pkcs11-keygen.8 pkcs11-keygen.c pkcs11-keygen.docbook pkcs11-keygen.html pkcs11-list.8 pkcs11-list.c pkcs11-list.docbook pkcs11-list.html src/external/bsd/bind/dist/bin/python [netbsd-6]: dnssec-checkds.8 dnssec-checkds.docbook dnssec-checkds.html dnssec-checkds.py.in dnssec-coverage.8 dnssec-coverage.docbook dnssec-coverage.html dnssec-coverage.py.in src/external/bsd/bind/dist/bin/rndc [netbsd-6]: Makefile.in rndc.8 rndc.c rndc.conf.5 rndc.conf.docbook rndc.conf.html rndc.docbook rndc.html util.c src/external/bsd/bind/dist/bin/tests [netbsd-6]: Makefile.in adb_test.c backtrace_test.c byaddr_test.c byname_test.c cfg_test.c compress_test.c db_test.c entropy2_test.c entropy_test.c fsaccess_test.c gxba_test.c gxbn_test.c hash_test.c inter_test.c keyboard_test.c lex_test.c lfsr_test.c log_test.c lwres_test.c lwresconf_test.c master_test.c name_test.c nsecify.c printmsg.c printmsg.h ratelimiter_test.c rbt_test.c rdata_test.c serial_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c wire_test.c zone_test.c src/external/bsd/bind/dist/bin/tests/atomic [netbsd-6]: t_atomic.c src/external/bsd/bind/dist/bin/tests/db [netbsd-6]: t_db.c src/external/bsd/bind/dist/bin/tests/dst [netbsd-6]: dst_test.c src/external/bsd/bind/dist/bin/tests/names [netbsd-6]: t_names.c src/external/bsd/bind/dist/bin/tests/net [netbsd-6]: driver.c netaddr_multicast.c src/external/bsd/bind/dist/bin/tests/rbt [netbsd-6]: t_rbt.c src/external/bsd/bind/dist/bin/tests/system [netbsd-6]: Makefile.in README cleanall.sh conf.sh.in genzone.sh run.sh runall.sh start.pl src/external/bsd/bind/dist/bin/tests/system/acl [netbsd-6]: clean.sh src/external/bsd/bind/dist/bin/tests/system/addzone [netbsd-6]: clean.sh tests.sh src/external/bsd/bind/dist/bin/tests/system/addzone/ns2 [netbsd-6]:
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: sevan Date: Tue Apr 25 18:52:31 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE Log Message: Switch BEAGLEBONE config over to using GENERIC.common. Remove duplicates already defined in GENERIC.common. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/BEAGLEBONE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/BEAGLEBONE diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.40 src/sys/arch/evbarm/conf/BEAGLEBONE:1.41 --- src/sys/arch/evbarm/conf/BEAGLEBONE:1.40 Thu Mar 30 17:17:41 2017 +++ src/sys/arch/evbarm/conf/BEAGLEBONE Tue Apr 25 18:52:31 2017 @@ -1,25 +1,16 @@ # -# $NetBSD: BEAGLEBONE,v 1.40 2017/03/30 17:17:41 sevan Exp $ +# $NetBSD: BEAGLEBONE,v 1.41 2017/04/25 18:52:31 sevan Exp $ # # BEAGLEBONE -- TI AM335x board Kernel # include "arch/evbarm/conf/std.beagle" - -# estimated number of users - -maxusers 32 - -# Standard system options - -options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT -#options NTP # NTP phase/frequency locked loop +include "arch/evbarm/conf/GENERIC.common" # CPU options options CPU_CORTEXA8 options TI_AM335X -options PMAPCOUNTERS # XXX The Cortex PMC delay() doesn't seem to work. #no options CORTEX_PMC @@ -27,122 +18,9 @@ options PMAPCOUNTERS # Architecture options #makeoptions CPUFLAGS+="-mthumb" -# File systems - -file-system FFS # UFS -#file-system LFS # log-structured file system -file-system MFS # memory file system -file-system NFS # Network file system -#file-system ADOSFS # AmigaDOS-compatible file system -file-system EXT2FS # second extended file system (linux) -#file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system MSDOSFS # MS-DOS file system -#file-system FDESC # /dev/fd -#file-system KERNFS # /kern -file-system NULLFS # loopback file system -#file-system PROCFS # /proc -#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) -#file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system -file-system TMPFS # memory file system -file-system PTYFS # /dev/pts/N support - -# File system options -#options QUOTA # legacy UFS quotas -#options QUOTA2 # new, in-filesystem UFS quotas -#options DISKLABEL_EI # disklabel Endian Independent support -#options FFS_EI # FFS Endian Independent support -#options NFSSERVER -options WAPBL # File system journaling support -#options FFS_NO_SNAPSHOT # No FFS snapshot support - -# Networking options - -#options GATEWAY # packet forwarding -options INET # IP + ICMP + TCP + UDP -options INET6 # IPV6 -#options IPSEC # IP security -#options IPSEC_DEBUG # debug for IP security -#options MROUTING # IP multicast routing -#options PIM # Protocol Independent Multicast -#options NETATALK # AppleTalk networking -#options PPP_BSDCOMP # BSD-Compress compression support for PPP -#options PPP_DEFLATE # Deflate compression support for PPP -#options PPP_FILTER # Active filter support for PPP (requires bpf) -#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG - -options NFS_BOOT_BOOTP -options NFS_BOOT_DHCP -#options NFS_BOOT_BOOTSTATIC -#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\"" -#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\"" -#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\"" -#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\"" -#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\"" - -options NFS_BOOT_RWSIZE=1024 - -# Compatibility options - -options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries -#options COMPAT_43 # 4.3BSD compatibility. -#options COMPAT_09 # NetBSD 0.9, -#options COMPAT_10 # NetBSD 1.0, -#options COMPAT_11 # NetBSD 1.1, -#options COMPAT_12 # NetBSD 1.2, -#options COMPAT_13 # NetBSD 1.3, -#options COMPAT_14 # NetBSD 1.4, -#options COMPAT_15 # NetBSD 1.5, -#options COMPAT_16 # NetBSD 1.6, -#options COMPAT_20 # NetBSD 2.0, -options COMPAT_30 # NetBSD 3.0, -options COMPAT_40 # NetBSD 4.0, -options COMPAT_50 # NetBSD 5.0, -options COMPAT_60 # NetBSD 6.0, and -options COMPAT_70 # NetBSD 7.0 binary compatibility. -#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. - -# Shared memory options - -options SYSVMSG # System V-like message queues -options SYSVSEM # System V-like semaphores -options SYSVSHM # System V-like memory sharing - -# Device options - -#options MEMORY_DISK_HOOKS # boottime setup of ramdisk -#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks -#options MEMORY_DISK_DYNAMIC -#options MINIROOTSIZE=1000 # Size in blocks -#options MEMORY_DISK_IS_ROOT # use memory disk as root - -# Wedge support -options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances -options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges - -# Miscellane
CVS commit: src/sys/dev/pci
Module Name:src Committed By: snj Date: Tue Apr 25 17:11:47 UTC 2017 Modified Files: src/sys/dev/pci: if_bge.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/dev/pci/if_bge.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_bge.c diff -u src/sys/dev/pci/if_bge.c:1.308 src/sys/dev/pci/if_bge.c:1.309 --- src/sys/dev/pci/if_bge.c:1.308 Thu Apr 20 09:18:05 2017 +++ src/sys/dev/pci/if_bge.c Tue Apr 25 17:11:47 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.308 2017/04/20 09:18:05 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.309 2017/04/25 17:11:47 snj Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.308 2017/04/20 09:18:05 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.309 2017/04/25 17:11:47 snj Exp $"); #include #include @@ -2667,7 +2667,7 @@ bge_blockinit(struct bge_softc *sc) /* * Bits 31-16: Programmable ring size (2048, 1024, 512, .., 32) * Bits 15-2 : Maximum RX frame size - * Bit 1 : 1 = Ring Disabled, 0 = Ring ENabled + * Bit 1 : 1 = Ring Disabled, 0 = Ring Enabled * Bit 0 : Reserved */ rcb->bge_maxlen_flags =
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Apr 25 13:20:41 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode. To generate a diff of this commit: cvs rdiff -u -r1.1437 -r1.1438 src/doc/3RDPARTY cvs rdiff -u -r1.2276 -r1.2277 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1437 src/doc/3RDPARTY:1.1438 --- src/doc/3RDPARTY:1.1437 Sun Apr 23 14:23:32 2017 +++ src/doc/3RDPARTY Tue Apr 25 09:20:41 2017 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1437 2017/04/23 18:23:32 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1438 2017/04/25 13:20:41 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1411,7 +1411,7 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2017a / tzdata2017b +Version: tzcode2017b / tzdata2017b Current Vers: tzcode2017b / tzdata2017b Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2276 src/doc/CHANGES:1.2277 --- src/doc/CHANGES:1.2276 Sun Apr 23 14:23:32 2017 +++ src/doc/CHANGES Tue Apr 25 09:20:41 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2276 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2277 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -502,3 +502,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd: Import dhcpcd 7.0.0-beta3 [roy 20170414] OpenSSH: Imported 7.5. [christos 20170418] tmux(1): Import of tmux 2.4 [christos 20170423] + libc: Update to tzcode2017b. [christos 20170425]
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Apr 25 13:19:45 UTC 2017 Modified Files: src/lib/libc/time: NEWS tz-link.htm version Log Message: merge tzcode2017b. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/NEWS cvs rdiff -u -r1.30 -r1.31 src/lib/libc/time/tz-link.htm cvs rdiff -u -r1.3 -r1.4 src/lib/libc/time/version 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/time/NEWS diff -u src/lib/libc/time/NEWS:1.20 src/lib/libc/time/NEWS:1.21 --- src/lib/libc/time/NEWS:1.20 Sat Mar 11 13:23:14 2017 +++ src/lib/libc/time/NEWS Tue Apr 25 09:19:44 2017 @@ -1,5 +1,21 @@ News for the tz database +Release 2017b - 2017-03-17 07:30:38 -0700 + + Briefly: Haiti has resumed DST. + + Changes to past and future time stamps + +Haiti resumed observance of DST in 2017. (Thanks to Steffen Thorsen.) + + Changes to past time stamps + +Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. + +Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" +is one byte over the POSIX limit. (Problem reported by Derick Rethans.) + + Release 2017a - 2017-02-28 00:05:36 -0800 Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia Index: src/lib/libc/time/tz-link.htm diff -u src/lib/libc/time/tz-link.htm:1.30 src/lib/libc/time/tz-link.htm:1.31 --- src/lib/libc/time/tz-link.htm:1.30 Sat Mar 11 13:23:14 2017 +++ src/lib/libc/time/tz-link.htm Tue Apr 25 09:19:44 2017 @@ -10,7 +10,7 @@ content="Sources for time zone and daylight saving time data"> - + http://www.iso.org/iso/catalogue_detail?csnumber=40874";>https://www.iso.org/standard/40874.html";>ISO 8601:2004 – Data elements and interchange formats – Information interchange – Representation of dates and times. Index: src/lib/libc/time/version diff -u src/lib/libc/time/version:1.3 src/lib/libc/time/version:1.4 --- src/lib/libc/time/version:1.3 Sat Mar 11 13:23:14 2017 +++ src/lib/libc/time/version Tue Apr 25 09:19:45 2017 @@ -1 +1 @@ -2017a +2017b
CVS commit: [pgoyette-localcount] src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 09:03:03 UTC 2017
Modified Files:
src/sys/kern [pgoyette-localcount]: subr_autoconf.c
Log Message:
Use KASSERTMSG() to ensure that the device has a localcount.
To generate a diff of this commit:
cvs rdiff -u -r1.246.2.8 -r1.246.2.9 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.246.2.8 src/sys/kern/subr_autoconf.c:1.246.2.9
--- src/sys/kern/subr_autoconf.c:1.246.2.8 Mon Mar 20 06:57:47 2017
+++ src/sys/kern/subr_autoconf.c Tue Apr 25 09:03:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.246.2.8 2017/03/20 06:57:47 pgoyette Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.246.2.9 2017/04/25 09:03:03 pgoyette Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.246.2.8 2017/03/20 06:57:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.246.2.9 2017/04/25 09:03:03 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -2252,8 +2252,9 @@ void
device_acquire(device_t dv)
{
- if (dv->dv_localcnt != NULL)
- localcount_acquire(dv->dv_localcnt);
+ KASSERTMSG(dv->dv_localcnt != NULL, "%s: device %s has no localcnt!",
+ __func__, dv->dv_cfdriver->cd_name)
+ localcount_acquire(dv->dv_localcnt);
}
/*
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Tue Apr 25 09:02:34 UTC 2017
Modified Files:
src/sys/arch/arm/arm32: db_machdep.c
Log Message:
Dump more of the trapframe
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm32/db_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/db_machdep.c
diff -u src/sys/arch/arm/arm32/db_machdep.c:1.23 src/sys/arch/arm/arm32/db_machdep.c:1.24
--- src/sys/arch/arm/arm32/db_machdep.c:1.23 Wed Feb 25 13:52:42 2015
+++ src/sys/arch/arm/arm32/db_machdep.c Tue Apr 25 09:02:34 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.23 2015/02/25 13:52:42 joerg Exp $ */
+/* $NetBSD: db_machdep.c,v 1.24 2017/04/25 09:02:34 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -33,7 +33,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.23 2015/02/25 13:52:42 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.24 2017/04/25 09:02:34 skrll Exp $");
#include
#include
@@ -447,7 +447,7 @@ db_show_frame_cmd(db_expr_t addr, bool h
frame->tf_r8, frame->tf_r9, frame->tf_r10, frame->tf_r11);
db_printf("r12=%08x r13=%08x r14=%08x r15=%08x\n",
frame->tf_r12, frame->tf_usr_sp, frame->tf_usr_lr, frame->tf_pc);
- db_printf("slr=%08x\n", frame->tf_svc_lr);
+ db_printf("slr=%08x ssp=%08x\n", frame->tf_svc_lr, frame->tf_svc_sp);
}
#if defined(_KERNEL) && defined(MULTIPROCESSOR)
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Tue Apr 25 09:02:05 UTC 2017
Modified Files:
src/sys/arch/arm/arm: db_trace.c
Log Message:
Report trapframe where possible
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/db_trace.c
diff -u src/sys/arch/arm/arm/db_trace.c:1.31 src/sys/arch/arm/arm/db_trace.c:1.32
--- src/sys/arch/arm/arm/db_trace.c:1.31 Sat Jan 24 15:44:32 2015
+++ src/sys/arch/arm/arm/db_trace.c Tue Apr 25 09:02:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.31 2015/01/24 15:44:32 skrll Exp $ */
+/* $NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.31 2015/01/24 15:44:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $");
#include
#include
@@ -86,6 +86,7 @@ db_stack_trace_print(db_expr_t addr, boo
db_expr_t count, const char *modif,
void (*pr)(const char *, ...))
{
+ struct trapframe *tf = NULL;
uint32_t *frame, *lastframe;
const char *cp = modif;
char c;
@@ -140,6 +141,7 @@ db_stack_trace_print(db_expr_t addr, boo
}
(*pr)("lid %d ", l.l_lid);
pcb = lwp_getpcb(&l);
+ tf = lwp_trapframe(&l);
#ifndef _KERNEL
struct pcb pcbb;
db_read_bytes((db_addr_t)pcb, sizeof(*pcb),
@@ -258,6 +260,9 @@ db_stack_trace_print(db_expr_t addr, boo
break;
}
} else if (INKERNEL((int)lastframe)) {
+ if (trace_thread) {
+(*pr)("--- tf %p ---\n", tf);
+ }
/* switch from user to kernel */
if (kernel_only)
break; /* kernel stack only */
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: skrll
Date: Tue Apr 25 09:01:38 UTC 2017
Modified Files:
src/sys/arch/arm/include: frame.h
Log Message:
Expose lwp_trapframe for _KEMUSER, e.g. crash(8)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/frame.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/arch/arm/include/frame.h
diff -u src/sys/arch/arm/include/frame.h:1.18 src/sys/arch/arm/include/frame.h:1.19
--- src/sys/arch/arm/include/frame.h:1.18 Sun Aug 18 05:07:19 2013
+++ src/sys/arch/arm/include/frame.h Tue Apr 25 09:01:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.18 2013/08/18 05:07:19 matt Exp $ */
+/* $NetBSD: frame.h,v 1.19 2017/04/25 09:01:38 skrll Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -100,14 +100,16 @@ struct sigframe_siginfo {
ucontext_t sf_uc; /* actual saved ucontext */
};
+#if defined(_KERNEL) || defined(_KMEMUSER)
#ifdef _KERNEL
__BEGIN_DECLS
void sendsig_sigcontext(const ksiginfo_t *, const sigset_t *);
void *getframe(struct lwp *, int, int *);
__END_DECLS
-#define lwp_trapframe(l) ((l)->l_md.md_tf)
#define lwp_settrapframe(l, tf) ((l)->l_md.md_tf = (tf))
#endif
+#define lwp_trapframe(l) ((l)->l_md.md_tf)
+#endif /* _KERNEL || _KMEMUSER */
#endif /* _LOCORE */
CVS commit: src/sys/kern
Module Name:src
Committed By: pgoyette
Date: Tue Apr 25 08:46:38 UTC 2017
Modified Files:
src/sys/kern: subr_devsw.c
Log Message:
Use __func__ for routine name in printf() calls. NFC intended.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.36 src/sys/kern/subr_devsw.c:1.37
--- src/sys/kern/subr_devsw.c:1.36 Fri Dec 16 23:35:04 2016
+++ src/sys/kern/subr_devsw.c Tue Apr 25 08:46:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.36 2016/12/16 23:35:04 riastradh Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.37 2017/04/25 08:46:38 pgoyette Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.36 2016/12/16 23:35:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.37 2017/04/25 08:46:38 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -252,7 +252,7 @@ bdevsw_attach(const struct bdevsw *devsw
}
if (*devmajor >= MAXDEVSW) {
- printf("bdevsw_attach: block majors exhausted");
+ printf("%s: block majors exhausted", __func__);
return (ENOMEM);
}
@@ -299,7 +299,7 @@ cdevsw_attach(const struct cdevsw *devsw
}
if (*devmajor >= MAXDEVSW) {
- printf("cdevsw_attach: character majors exhausted");
+ printf("%s: character majors exhausted", __func__);
return (ENOMEM);
}
@@ -551,7 +551,7 @@ devsw_name2blk(const char *name, char *d
if (devname != NULL) {
#ifdef DEVSW_DEBUG
if (strlen(conv->d_name) >= devnamelen)
-printf("devsw_name2blk: too short buffer");
+printf("%s: too short buffer", __func__);
#endif /* DEVSW_DEBUG */
strncpy(devname, conv->d_name, devnamelen);
devname[devnamelen - 1] = '\0';
@@ -599,7 +599,7 @@ devsw_name2chr(const char *name, char *d
if (devname != NULL) {
#ifdef DEVSW_DEBUG
if (strlen(conv->d_name) >= devnamelen)
-printf("devsw_name2chr: too short buffer");
+printf("%s: too short buffer", __func__);
#endif /* DEVSW_DEBUG */
strncpy(devname, conv->d_name, devnamelen);
devname[devnamelen - 1] = '\0';
