CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 04:31:17 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_50_mod.c
src/sys/modules [pgoyette-compat]: Makefile
src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile
src/sys/opencrypto [pgoyette-compat]: ocryptodev.h
Log Message:
No need to declare the crypto_50 init/fini routines. The compat_50
module no longer needs them, and they're declared static in the
ocryptodev.c code
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.202.2.36 -r1.202.2.37 src/sys/modules/Makefile
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.3.16.4 -r1.3.16.5 src/sys/opencrypto/ocryptodev.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/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.15 src/sys/compat/common/compat_50_mod.c:1.1.2.16
--- src/sys/compat/common/compat_50_mod.c:1.1.2.15 Sun Sep 23 04:27:48 2018
+++ src/sys/compat/common/compat_50_mod.c Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.16 2018/09/23 04:31:17 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.16 2018/09/23 04:31:17 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -47,8 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: compat_50_mo
#include
#include
-#include
-
#include
#include
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.36 src/sys/modules/Makefile:1.202.2.37
--- src/sys/modules/Makefile:1.202.2.36 Sun Sep 23 01:33:25 2018
+++ src/sys/modules/Makefile Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.36 2018/09/23 01:33:25 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.37 2018/09/23 04:31:17 pgoyette Exp $
.include
@@ -14,6 +14,7 @@ SUBDIR+= compat_60 compat_70 compat_
SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
+SUBDIR+= compat_raid_50
SUBDIR+= compat_raid_80
SUBDIR+= compat_crypto_50
Index: src/sys/modules/compat_crypto_50/Makefile
diff -u src/sys/modules/compat_crypto_50/Makefile:1.1.2.2 src/sys/modules/compat_crypto_50/Makefile:1.1.2.3
--- src/sys/modules/compat_crypto_50/Makefile:1.1.2.2 Sun Sep 23 03:44:04 2018
+++ src/sys/modules/compat_crypto_50/Makefile Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.2 2018/09/23 03:44:04 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2018/09/23 04:31:17 pgoyette Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@ CPPFLAGS+= -DCOMPAT_50
.PATH: ${S}/opencrypto
-KMOD= crypto
+KMOD= compat_crypto_50
SRCS= ocryptodev.c
.include
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.3.16.4 src/sys/opencrypto/ocryptodev.h:1.3.16.5
--- src/sys/opencrypto/ocryptodev.h:1.3.16.4 Sun Sep 23 03:44:04 2018
+++ src/sys/opencrypto/ocryptodev.h Sun Sep 23 04:31:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.3.16.4 2018/09/23 03:44:04 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3.16.5 2018/09/23 04:31:17 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -178,7 +178,4 @@ struct crypt_n_op;
int ocryptof_ioctl(struct file *, u_long, void *);
-void cryptodev_50_init(void);
-void cryptodev_50_fini(void);
-
#endif /* _CRYPTO_OCRYPTODEV_H_ */
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 23 04:27:49 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_50_mod.c Log Message: Now that cryptodev_50 is a separate module we can't initialize it from the generic compat_50 module. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/compat/common/compat_50_mod.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/common/compat_50_mod.c diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.14 src/sys/compat/common/compat_50_mod.c:1.1.2.15 --- src/sys/compat/common/compat_50_mod.c:1.1.2.14 Sat Sep 22 22:21:46 2018 +++ src/sys/compat/common/compat_50_mod.c Sun Sep 23 04:27:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $ */ +/* $NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -84,7 +84,6 @@ compat_50_init(void) uipc_syscalls_50_init(); clockctl_50_init(); if_spppsubr_50_init(); - cryptodev_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init(); @@ -111,7 +110,6 @@ compat_50_fini(void) vnd_50_fini(); wsevent_50_fini(); puffs_50_fini(); - cryptodev_50_fini(); if_spppsubr_50_fini(); clockctl_50_fini(); uipc_syscalls_50_fini(); @@ -147,7 +145,6 @@ compat_50_fini(void) uipc_syscalls_50_init(); clockctl_50_init(); if_spppsubr_50_init(); - cryptodev_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init();
CVS commit: [pgoyette-compat] src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Sun Sep 23 03:54:08 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: mi Log Message: Use the correct module name To generate a diff of this commit: cvs rdiff -u -r1.114.2.23 -r1.114.2.24 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.114.2.23 src/distrib/sets/lists/modules/mi:1.114.2.24 --- src/distrib/sets/lists/modules/mi:1.114.2.23 Sun Sep 23 01:33:25 2018 +++ src/distrib/sets/lists/modules/mi Sun Sep 23 03:54:08 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.114.2.23 2018/09/23 01:33:25 pgoyette Exp $ +# $NetBSD: mi,v 1.114.2.24 2018/09/23 03:54:08 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -102,6 +102,8 @@ ./@MODULEDIR@/compat_80/compat_80.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_ossaudio base-kernel-modules kmod ./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_crypto_50 base-kernel-modules kmod +./@MODULEDIR@/compat_crypto_50/compat_crypto_50.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_raid_50 base-kernel-modules kmod ./@MODULEDIR@/compat_raid_50/compat_raid_50.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_raid_80 base-kernel-modules kmod @@ -118,8 +120,6 @@ ./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules kmod ./@MODULEDIR@/cryptobase-kernel-modules kmod ./@MODULEDIR@/crypto/crypto.kmod base-kernel-modules kmod -./@MODULEDIR@/crypto_50base-kernel-modules kmod -./@MODULEDIR@/crypto_50/crypto_50.kmod base-kernel-modules kmod ./@MODULEDIR@/cyclicbase-kernel-modules kmod,dtrace ./@MODULEDIR@/cyclic/cyclic.kmod base-kernel-modules kmod,dtrace ./@MODULEDIR@/dbcoolbase-kernel-modules kmod
CVS commit: [pgoyette-compat] src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Sun Sep 23 03:50:12 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: md.amd64 Log Message: Mark the correct module obsolete! To generate a diff of this commit: cvs rdiff -u -r1.75.2.8 -r1.75.2.9 src/distrib/sets/lists/modules/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.75.2.8 src/distrib/sets/lists/modules/md.amd64:1.75.2.9 --- src/distrib/sets/lists/modules/md.amd64:1.75.2.8 Sat Sep 22 11:41:35 2018 +++ src/distrib/sets/lists/modules/md.amd64 Sun Sep 23 03:50:12 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.75.2.8 2018/09/22 11:41:35 pgoyette Exp $ +# $NetBSD: md.amd64,v 1.75.2.9 2018/09/23 03:50:12 pgoyette Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -52,9 +52,9 @@ ./@MODULEDIR@/compat_linux base-kernel-modules kmod ./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_linux32 base-kernel-modules kmod -./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-obsolete obsolete +./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete -./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete ./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod #./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod
CVS commit: [pgoyette-compat] src/sys
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 03:44:04 UTC 2018
Modified Files:
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c
src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile
src/sys/opencrypto [pgoyette-compat]: ocryptodev.c ocryptodev.h
Log Message:
Fix some thinkos/pastos/typos
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.11.2.6 -r1.11.2.7 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.3.16.3 -r1.3.16.4 src/sys/opencrypto/ocryptodev.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/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.5 src/sys/dev/raidframe/rf_compat50.c:1.3.2.6
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.5 Sun Sep 23 01:33:25 2018
+++ src/sys/dev/raidframe/rf_compat50.c Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.5 2018/09/23 01:33:25 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.6 2018/09/23 03:44:04 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -264,10 +264,10 @@ raid_50_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
- MODULE_CMD_INIT:
+ case MODULE_CMD_INIT:
raidframe_50_init();
return 0;
- MODULE_CMD_FINI:
+ case MODULE_CMD_FINI:
raidframe_50_fini();
return 0;
default:
Index: src/sys/modules/compat_crypto_50/Makefile
diff -u src/sys/modules/compat_crypto_50/Makefile:1.1.2.1 src/sys/modules/compat_crypto_50/Makefile:1.1.2.2
--- src/sys/modules/compat_crypto_50/Makefile:1.1.2.1 Sun Sep 23 01:33:26 2018
+++ src/sys/modules/compat_crypto_50/Makefile Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.1 2018/09/23 01:33:26 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2018/09/23 03:44:04 pgoyette Exp $
.include "../Makefile.inc"
@@ -7,6 +7,6 @@ CPPFLAGS+= -DCOMPAT_50
.PATH: ${S}/opencrypto
KMOD= crypto
-SRCS= ocryptodev.c ocryptodev.c
+SRCS= ocryptodev.c
.include
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.6 src/sys/opencrypto/ocryptodev.c:1.11.2.7
--- src/sys/opencrypto/ocryptodev.c:1.11.2.6 Sun Sep 23 01:33:26 2018
+++ src/sys/opencrypto/ocryptodev.c Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.7 2018/09/23 03:44:04 pgoyette Exp $");
#include
#include
@@ -106,7 +106,8 @@ static int ocryptodev_op(struct csession
static int ocryptodev_mop(struct fcrypt *, struct ocrypt_n_op *, int,
struct lwp *);
static int ocryptodev_session(struct fcrypt *, struct osession_op *);
-static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *);
+static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *,
+ int);
int
ocryptof_ioctl(struct file *fp, u_long cmd, void *data)
@@ -153,10 +154,10 @@ mbail:
kmem_free(osnop, osgop->count * sizeof(struct osession_n_op));
break;
case OCIOCCRYPT:
- mutex_enter(mtx);
+ mutex_enter(_mtx);
ocop = (struct ocrypt_op *)data;
- cse = cryptodev_csefind)(fcr, ocop->ses);
- mutex_exit(mtx);
+ cse = cryptodev_csefind(fcr, ocop->ses);
+ mutex_exit(_mtx);
if (cse == NULL) {
DPRINTF("csefind failed\n");
return EINVAL;
@@ -310,10 +311,10 @@ compat_crypto_50_modcmd(modcmd_t cmd, vo
{
switch (cmd) {
- MODULE_CMD_INIT:
+ case MODULE_CMD_INIT:
crypto_50_init();
return 0;
- MODULE_CMD_FINI:
+ case MODULE_CMD_FINI:
crypto_50_fini();
return 0;
default:
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.3.16.3 src/sys/opencrypto/ocryptodev.h:1.3.16.4
--- src/sys/opencrypto/ocryptodev.h:1.3.16.3 Sat Sep 22 10:42:00 2018
+++ src/sys/opencrypto/ocryptodev.h Sun Sep 23 03:44:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.3.16.3 2018/09/22 10:42:00 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3.16.4 2018/09/23 03:44:04 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -176,11 +176,7 @@ struct csession;
struct crypt_op;
struct crypt_n_op;
-int ocryptof_ioctl(struct file *, u_long, void *, kmutex_t *,
-int (*)(struct fcrypt *, struct session_op *),
-int (*)(struct csession *, struct crypt_op *, struct lwp *),
-int (*)(struct fcrypt *,
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: cherry Date: Sun Sep 23 02:51:06 UTC 2018 Modified Files: src/sys/arch/x86/pci: pci_intr_machdep.c Log Message: Revert: http://mail-index.netbsd.org/source-changes/2018/09/10/msg098995.html It is incorrect to infer semantics from usage. the problem for which the original commit was intended should be fixed within the callee intr_establish_xname() and not the caller: pci_intr_find_intx_irq() This was accomplished via: http://mail-index.netbsd.org/source-changes/2018/09/20/msg099286.html To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/pci/pci_intr_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/x86/pci/pci_intr_machdep.c diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.44 src/sys/arch/x86/pci/pci_intr_machdep.c:1.45 --- src/sys/arch/x86/pci/pci_intr_machdep.c:1.44 Mon Sep 10 02:49:23 2018 +++ src/sys/arch/x86/pci/pci_intr_machdep.c Sun Sep 23 02:51:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_intr_machdep.c,v 1.44 2018/09/10 02:49:23 cherry Exp $ */ +/* $NetBSD: pci_intr_machdep.c,v 1.45 2018/09/23 02:51:06 cherry Exp $ */ /*- * Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.44 2018/09/10 02:49:23 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.45 2018/09/23 02:51:06 cherry Exp $"); #include #include @@ -294,7 +294,9 @@ pci_intr_find_intx_irq(pci_intr_handle_t return ENOENT; *pic = >sc_pic; *pin = APIC_IRQ_PIN(ih); - *irq = -1; /* PCI doesn't use legacy irq */ + *irq = APIC_IRQ_LEGACY_IRQ(ih); + if (*irq < 0 || *irq >= NUM_LEGACY_IRQS) + *irq = -1; } #endif
CVS commit: src/sys/arch/xen
Module Name:src
Committed By: cherry
Date: Sun Sep 23 02:27:25 UTC 2018
Modified Files:
src/sys/arch/xen/include: hypervisor.h
src/sys/arch/xen/xen: evtchn.c
Log Message:
Encapsulate pre-processing of registered (pirq,evtchn) pair in
preparation for API reorg.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/xen/include/hypervisor.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/xen/xen/evtchn.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/include/hypervisor.h
diff -u src/sys/arch/xen/include/hypervisor.h:1.44 src/sys/arch/xen/include/hypervisor.h:1.45
--- src/sys/arch/xen/include/hypervisor.h:1.44 Sat Jun 14 02:53:02 2014
+++ src/sys/arch/xen/include/hypervisor.h Sun Sep 23 02:27:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.h,v 1.44 2014/06/14 02:53:02 pgoyette Exp $ */
+/* $NetBSD: hypervisor.h,v 1.45 2018/09/23 02:27:24 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -130,6 +130,7 @@ extern volatile shared_info_t *HYPERVISO
struct intrframe;
struct cpu_info;
void do_hypervisor_callback(struct intrframe *regs);
+void hypervisor_prime_pirq_event(int, unsigned int);
void hypervisor_enable_event(unsigned int);
extern int xen_version;
Index: src/sys/arch/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.80 src/sys/arch/xen/xen/evtchn.c:1.81
--- src/sys/arch/xen/xen/evtchn.c:1.80 Sun Jun 24 13:35:33 2018
+++ src/sys/arch/xen/xen/evtchn.c Sun Sep 23 02:27:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.80 2018/06/24 13:35:33 jdolecek Exp $ */
+/* $NetBSD: evtchn.c,v 1.81 2018/09/23 02:27:24 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.80 2018/06/24 13:35:33 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.81 2018/09/23 02:27:24 cherry Exp $");
#include "opt_xen.h"
#include "isa.h"
@@ -737,7 +737,6 @@ pirq_establish(int pirq, int evtch, int
const char *intrname, const char *xname)
{
struct pintrhand *ih;
- physdev_op_t physdev_op;
ih = kmem_zalloc(sizeof(struct pintrhand),
cold ? KM_NOSLEEP : KM_SLEEP);
@@ -759,17 +758,7 @@ pirq_establish(int pirq, int evtch, int
return NULL;
}
- physdev_op.cmd = PHYSDEVOP_IRQ_STATUS_QUERY;
- physdev_op.u.irq_status_query.irq = pirq;
- if (HYPERVISOR_physdev_op(_op) < 0)
- panic("HYPERVISOR_physdev_op(PHYSDEVOP_IRQ_STATUS_QUERY)");
- if (physdev_op.u.irq_status_query.flags &
- PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY) {
- pirq_needs_unmask_notify[evtch >> 5] |= (1 << (evtch & 0x1f));
-#ifdef IRQ_DEBUG
- printf("pirq %d needs notify\n", pirq);
-#endif
- }
+ hypervisor_prime_pirq_event(pirq, evtch);
hypervisor_enable_event(evtch);
return ih;
}
@@ -1006,6 +995,25 @@ event_remove_handler(int evtch, int (*fu
}
void
+hypervisor_prime_pirq_event(int pirq, unsigned int evtch)
+{
+#if NPCI > 0 || NISA > 0
+ physdev_op_t physdev_op;
+ physdev_op.cmd = PHYSDEVOP_IRQ_STATUS_QUERY;
+ physdev_op.u.irq_status_query.irq = pirq;
+ if (HYPERVISOR_physdev_op(_op) < 0)
+ panic("HYPERVISOR_physdev_op(PHYSDEVOP_IRQ_STATUS_QUERY)");
+ if (physdev_op.u.irq_status_query.flags &
+ PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY) {
+ pirq_needs_unmask_notify[evtch >> 5] |= (1 << (evtch & 0x1f));
+#ifdef IRQ_DEBUG
+ printf("pirq %d needs notify\n", pirq);
+#endif
+ }
+#endif /* NPCI > 0 || NISA > 0 */
+}
+
+void
hypervisor_enable_event(unsigned int evtch)
{
#ifdef IRQ_DEBUG
CVS commit: src/usr.sbin/ypserv/ypinit
Module Name:src
Committed By: kre
Date: Sun Sep 23 02:15:25 UTC 2018
Modified Files:
src/usr.sbin/ypserv/ypinit: ypinit.8 ypinit.sh
Log Message:
Switch from getopt to getopts - and as part of that, update the usage,
and the man page, to reflect modern usage rather than some ancient style
that getopt[s] does not support (options, and their args when they exist)
always come before non-option agrs.
While here, update uses of test(1) to avoid obsolescent forms (and
even when still defined, prefer sh structures over test when possible).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/ypserv/ypinit/ypinit.8
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ypserv/ypinit/ypinit.sh
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/ypserv/ypinit/ypinit.8
diff -u src/usr.sbin/ypserv/ypinit/ypinit.8:1.17 src/usr.sbin/ypserv/ypinit/ypinit.8:1.18
--- src/usr.sbin/ypserv/ypinit/ypinit.8:1.17 Mon Jul 3 21:35:33 2017
+++ src/usr.sbin/ypserv/ypinit/ypinit.8 Sun Sep 23 02:15:25 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ypinit.8,v 1.17 2017/07/03 21:35:33 wiz Exp $
+.\" $NetBSD: ypinit.8,v 1.18 2018/09/23 02:15:25 kre Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -36,17 +36,17 @@
.Sh SYNOPSIS
.Nm
.Fl c
-.Op Ar domainname
.Op Fl l Ar server1,...,serverN
+.Op Ar domainname
.Nm
.Fl m
-.Op Ar domainname
.Op Fl l Ar server1,...,serverN
+.Op Ar domainname
.Nm
.Fl s
.Ar master_server
-.Op Ar domainname
.Op Fl l Ar server1,...,serverN
+.Op Ar domainname
.Sh DESCRIPTION
.Nm
initializes the files and directories that are required for a
Index: src/usr.sbin/ypserv/ypinit/ypinit.sh
diff -u src/usr.sbin/ypserv/ypinit/ypinit.sh:1.13 src/usr.sbin/ypserv/ypinit/ypinit.sh:1.14
--- src/usr.sbin/ypserv/ypinit/ypinit.sh:1.13 Fri Jul 20 13:11:01 2018
+++ src/usr.sbin/ypserv/ypinit/ypinit.sh Sun Sep 23 02:15:25 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ypinit.sh,v 1.13 2018/07/20 13:11:01 kre Exp $
+# $NetBSD: ypinit.sh,v 1.14 2018/09/23 02:15:25 kre Exp $
#
# ypinit.sh - setup a master or slave YP server
#
@@ -30,51 +30,44 @@ if [ $( ${ID} -u ) != 0 ]; then
exit 1
fi
-args=$(getopt cl:ms: $*) # XXX should switch to getopts
-if [ $? -eq 0 ]; then
- set -- $args
- for i; do
- case $i in
- "-c")
- servertype=client
- shift
- ;;
- "-m")
- servertype=master
- shift
- ;;
- "-s")
- servertype=slave
- master=${2}
- shift
- shift
- ;;
- "-l")
- noninteractive=yes
- serverlist=${2}
- shift
- shift
- ;;
- "--")
- shift
- break
- ;;
- esac
- done
+while getopts cl:ms: i
+do
+ case $i in
+ c)
+ servertype=client
+ ;;
+ l)
+ noninteractive=yes
+ serverlist=${OPTARG}
+ ;;
+ m)
+ servertype=master
+ ;;
+ s)
+ servertype=slave
+ master=${OPTARG}
+ ;;
+ \?)
+ echo >&2 # "Illegal option" message issued by getopts
+ servertype= # force usage message just below
+ break
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
- if [ $# -eq 1 ]; then
- domain=${1}
- shift;
- else
- domain=$( ${BIN_DOMAINNAME} )
- fi
+if [ $# -eq 1 ]; then
+ domain=${1}
+ shift;
+else
+ domain=$( ${BIN_DOMAINNAME} )
fi
if [ -z ${servertype} ]; then
cat 1>&2 << __usage
-usage: ${progname} -c [domainname] [-l server1,...,serverN]
- ${progname} -m [domainname] [-l server1,...,serverN]
- ${progname} -s master_server [domainname] [-l server1,...,serverN]
+usage: ${progname} -c [-l server1,...,serverN] [domainname]
+ ${progname} -m [-l server1,...,serverN] [domainname]
+ ${progname} -s master_server [-l server1,...,serverN] [domainname]
The \`-c' flag sets up a YP client, the \`-m' flag builds a master YP
server, and the \`-s' flag builds a slave YP server. When building a
@@ -104,14 +97,14 @@ __no_hostname
exit 1
fi
-if [ "${servertype}" = "slave" -a "${host}" = "${master}" ]; then
+if [ "${servertype}" = slave ] && [ "${host}" = "${master}" ]; then
echo 1>&2 \
"$progname: cannot setup a YP slave server off the local host."
exit 1
fi
# Check if the YP directory exists.
-if [ ! -d ${yp_dir} -o -f ${yp_dir} ]; then
+if ! [ -d "${yp_dir}" ]; then
cat 1>&2 << __no_dir
$progname: The directory ${yp_dir} does not exist.
Restore it from the distribution.
@@ -128,7 +121,7 @@ fi
echo ""
binding_dir=${yp_dir}/binding
-if [ ! -d ${binding_dir} ]; then
+if ! [ -d ${binding_dir} ]; then
cat 1>&2 << __no_dir
$progname: The directory ${binding_dir} does not exist.
Restore it from the distribution.
@@ -152,13 +145,13 @@ When finished, press RETURN on a blank l
__list_of_servers
- if [ "${servertype}" != "client" ]; then
- echo ${host} >> ${tmpfile}
+ if [ "${servertype}" != client ]; then
+ echo "${host}" >> ${tmpfile}
echo " next host: ${host}";
fi
echo -n " next host: ";
- while read nextserver ; test -n "${nextserver}"
+ while read nextserver && test -n "${nextserver}"
do
CVS commit: [pgoyette-compat] src
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 01:33:26 UTC 2018
Modified Files:
src/distrib/sets/lists/modules [pgoyette-compat]: mi
src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c
src/sys/modules [pgoyette-compat]: Makefile
src/sys/modules/compat_50 [pgoyette-compat]: Makefile
src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile
src/sys/modules/compat_raid_50 [pgoyette-compat]: Makefile
src/sys/modules/crypto [pgoyette-compat]: Makefile
src/sys/opencrypto [pgoyette-compat]: cryptodev.c files.opencrypto
ocryptodev.c
src/sys/sys [pgoyette-compat]: compat_stub.h
Added Files:
src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile
Log Message:
Split the compat_crypto_50 from the rest of the crypto module
Cleanup some stuff left over from similar changes to raid modules.
To generate a diff of this commit:
cvs rdiff -u -r1.114.2.22 -r1.114.2.23 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.202.2.35 -r1.202.2.36 src/sys/modules/Makefile
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/modules/compat_50/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/modules/compat_netbsd32_16/Makefile
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_raid_50/Makefile
cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/modules/crypto/Makefile
cvs rdiff -u -r1.98.2.5 -r1.98.2.6 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.26.8.1 -r1.26.8.2 src/sys/opencrypto/files.opencrypto
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/sys/compat_stub.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.114.2.22 src/distrib/sets/lists/modules/mi:1.114.2.23
--- src/distrib/sets/lists/modules/mi:1.114.2.22 Sat Sep 22 22:21:46 2018
+++ src/distrib/sets/lists/modules/mi Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114.2.22 2018/09/22 22:21:46 pgoyette Exp $
+# $NetBSD: mi,v 1.114.2.23 2018/09/23 01:33:25 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -118,6 +118,8 @@
./@MODULEDIR@/coredump/coredump.kmod base-kernel-modules kmod
./@MODULEDIR@/cryptobase-kernel-modules kmod
./@MODULEDIR@/crypto/crypto.kmod base-kernel-modules kmod
+./@MODULEDIR@/crypto_50base-kernel-modules kmod
+./@MODULEDIR@/crypto_50/crypto_50.kmod base-kernel-modules kmod
./@MODULEDIR@/cyclicbase-kernel-modules kmod,dtrace
./@MODULEDIR@/cyclic/cyclic.kmod base-kernel-modules kmod,dtrace
./@MODULEDIR@/dbcoolbase-kernel-modules kmod
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.4 src/sys/dev/raidframe/rf_compat50.c:1.3.2.5
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.4 Tue Sep 18 23:03:54 2018
+++ src/sys/dev/raidframe/rf_compat50.c Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.3.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.3.2.5 2018/09/23 01:33:25 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
@@ -255,3 +256,21 @@ raidframe_50_fini(void)
raidframe50_ioctl_hook_unset();
}
+
+MODULE(MODULE_CLASS_EXEC, raid_50, "raid,compat_50");
+
+static int
+raid_50_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ MODULE_CMD_INIT:
+ raidframe_50_init();
+ return 0;
+ MODULE_CMD_FINI:
+ raidframe_50_fini();
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.35 src/sys/modules/Makefile:1.202.2.36
--- src/sys/modules/Makefile:1.202.2.35 Sat Sep 22 22:21:46 2018
+++ src/sys/modules/Makefile Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.35 2018/09/22 22:21:46 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.36 2018/09/23 01:33:25 pgoyette Exp $
.include
@@ -16,6 +16,8 @@ SUBDIR+= compat_sysv_10 compat_sysv_14 c
SUBDIR+= compat_raid_80
+SUBDIR+= compat_crypto_50
+
SUBDIR+= accf_dataready
SUBDIR+= accf_httpready
SUBDIR+= adosfs
Index: src/sys/modules/compat_50/Makefile
diff -u src/sys/modules/compat_50/Makefile:1.1.2.9 src/sys/modules/compat_50/Makefile:1.1.2.10
--- src/sys/modules/compat_50/Makefile:1.1.2.9 Wed Sep 19 04:12:43 2018
+++ src/sys/modules/compat_50/Makefile Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.9 2018/09/19 04:12:43 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.10 2018/09/23 01:33:25 pgoyette Exp $
.include "../Makefile.inc"
@@ -14,10 +14,6 @@ SRCS+= vfs_syscalls_50.c uipc_syscalls_5
SRCS+= rndpseudo_50.c clockctl_50.c if_spppsubr50.c
CVS commit: src/sys/arch
Module Name:src
Committed By: cherry
Date: Sun Sep 23 01:00:00 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: db_interface.c machdep.c
src/sys/arch/amd64/include: segments.h
src/sys/arch/i386/i386: machdep.c
src/sys/arch/i386/include: segments.h
src/sys/arch/x86/x86: idt.c lapic.c
src/sys/arch/xen/x86: xenfunc.c
Log Message:
Make XEN use the same api as native, for idt vector allocation
and registration.
lidt() placed in xenfunc() on maxv@ suggestion.
There should be no functional change due to this commit.
Tested on amd64 native and XEN.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.318 -r1.319 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/include/segments.h
cvs rdiff -u -r1.808 -r1.809 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/i386/include/segments.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/idt.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/x86/lapic.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/xen/x86/xenfunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/db_interface.c
diff -u src/sys/arch/amd64/amd64/db_interface.c:1.33 src/sys/arch/amd64/amd64/db_interface.c:1.34
--- src/sys/arch/amd64/amd64/db_interface.c:1.33 Tue Apr 3 07:20:52 2018
+++ src/sys/arch/amd64/amd64/db_interface.c Sun Sep 23 00:59:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.33 2018/04/03 07:20:52 christos Exp $ */
+/* $NetBSD: db_interface.c,v 1.34 2018/09/23 00:59:59 cherry Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.33 2018/04/03 07:20:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.34 2018/09/23 00:59:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -113,7 +113,7 @@ db_machine_init(void)
handler = _x2apic_ddbipi;
#endif
ddb_vec = idt_vec_alloc(0xf0, 0xff);
- setgate([ddb_vec], handler, 1, SDT_SYS386IGT, SEL_KPL,
+ set_idtgate([ddb_vec], handler, 1, SDT_SYS386IGT, SEL_KPL,
GSEL(GCODE_SEL, SEL_KPL));
#else
/* Initialised as part of xen_ipi_init() */
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.318 src/sys/arch/amd64/amd64/machdep.c:1.319
--- src/sys/arch/amd64/amd64/machdep.c:1.318 Wed Aug 29 16:26:25 2018
+++ src/sys/arch/amd64/amd64/machdep.c Sun Sep 23 00:59:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.318 2018/08/29 16:26:25 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.319 2018/09/23 00:59:59 cherry Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.318 2018/08/29 16:26:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.319 2018/09/23 00:59:59 cherry Exp $");
#include "opt_modular.h"
#include "opt_user_ldt.h"
@@ -1397,11 +1397,6 @@ setregs(struct lwp *l, struct exec_packa
/*
* Initialize segments and descriptor tables
*/
-
-#ifdef XEN
-struct trap_info *xen_idt;
-int xen_idt_idx;
-#endif
char *ldtstore;
char *gdtstore;
@@ -1486,15 +1481,10 @@ set_sys_segment(struct sys_segment_descr
void
cpu_init_idt(void)
{
-#ifndef XEN
struct region_descriptor region;
setregion(, idt, NIDT * sizeof(idt[0]) - 1);
lidt();
-#else
- if (HYPERVISOR_set_trap_table(xen_idt))
- panic("HYPERVISOR_set_trap_table() failed");
-#endif
}
#define IDTVEC(name) __CONCAT(X, name)
@@ -1681,7 +1671,6 @@ init_x86_64(paddr_t first_avail)
extern vaddr_t lwp0uarea;
#ifndef XEN
extern paddr_t local_apic_pa;
- int ist;
#endif
KASSERT(first_avail % PAGE_SIZE == 0);
@@ -1806,12 +1795,7 @@ init_x86_64(paddr_t first_avail)
pmap_update(pmap_kernel());
-#ifndef XEN
- idt = (struct gate_descriptor *)idt_vaddr;
-#else
- xen_idt = (struct trap_info *)idt_vaddr;
- xen_idt_idx = 0;
-#endif
+ idt = (idt_descriptor_t *)idt_vaddr;
gdtstore = (char *)gdt_vaddr;
ldtstore = (char *)ldt_vaddr;
@@ -1870,8 +1854,14 @@ init_x86_64(paddr_t first_avail)
/* CPU-specific IDT exceptions. */
for (x = 0; x < NCPUIDT; x++) {
-#ifndef XEN
+ int sel, ist;
+
+ /* Reset to default. Special cases below */
+ sel = SEL_KPL;
+ ist = 0;
+
idt_vec_reserve(x);
+
switch (x) {
case 1: /* DB */
ist = 4;
@@ -1879,56 +1869,31 @@ init_x86_64(paddr_t first_avail)
case 2: /* NMI */
ist = 3;
break;
+ case 3:
+ case 4:
+ sel = SEL_UPL;
+ break;
case 8: /* double fault */
ist = 2;
break;
- default:
- ist = 0;
- break;
- }
- setgate([x], x86_exceptions[x], ist, SDT_SYS386IGT,
- (x == 3 || x == 4) ? SEL_UPL : SEL_KPL,
- GSEL(GCODE_SEL, SEL_KPL));
-#else /* XEN */
- pmap_changeprot_local(idt_vaddr, VM_PROT_READ|VM_PROT_WRITE);
- idt_vec_reserve(x);
-
CVS commit: [pgoyette-compat] src/sys/arch/acorn32/acorn32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 22 22:36:37 UTC 2018
Added Files:
src/sys/arch/acorn32/acorn32 [pgoyette-compat]: netbsd32_machdep_16.c
Log Message:
Add dummy file since the compat_16 code assumes that there might be
some MD code here.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c
diff -u /dev/null src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c:1.1.2.1
--- /dev/null Sat Sep 22 22:36:37 2018
+++ src/sys/arch/acorn32/acorn32/netbsd32_machdep_16.c Sat Sep 22 22:36:37 2018
@@ -0,0 +1,91 @@
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/22 22:36:37 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *or promote products derived from this software without specific prior
+ *written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/22 22:36:37 pgoyette Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_compat_netbsd.h"
+#include "opt_coredump.h"
+#include "opt_execfmt.h"
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+void
+netbsd32_machdep_md_16_init(void)
+{
+
+ /* nothing to do */
+}
+
+void
+netbsd32_machdep_md_16_fini(void)
+{
+
+ /* nothing to do */
+}
CVS commit: [pgoyette-compat] src
Module Name:src Committed By: pgoyette Date: Sat Sep 22 22:21:47 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: mi src/sys/compat/common [pgoyette-compat]: compat_50_mod.c compat_80_mod.c src/sys/modules [pgoyette-compat]: Makefile Added Files: src/sys/compat/common [pgoyette-compat]: compat_raid_50.c compat_raid_80.c src/sys/modules/compat_raid_50 [pgoyette-compat]: Makefile src/sys/modules/compat_raid_80 [pgoyette-compat]: Makefile Log Message: Split the raidframe compatability code out into separate modules, since the driver is already a module. This avoids having to pass a bunch of function pointers as arguments to raidframe's compat_ioctl(). To generate a diff of this commit: cvs rdiff -u -r1.114.2.21 -r1.114.2.22 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/compat/common/compat_80_mod.c cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_raid_50.c \ src/sys/compat/common/compat_raid_80.c cvs rdiff -u -r1.202.2.34 -r1.202.2.35 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_raid_50/Makefile cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_raid_80/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.114.2.21 src/distrib/sets/lists/modules/mi:1.114.2.22 --- src/distrib/sets/lists/modules/mi:1.114.2.21 Mon Sep 10 08:44:50 2018 +++ src/distrib/sets/lists/modules/mi Sat Sep 22 22:21:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.114.2.21 2018/09/10 08:44:50 pgoyette Exp $ +# $NetBSD: mi,v 1.114.2.22 2018/09/22 22:21:46 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -101,7 +101,11 @@ ./@MODULEDIR@/compat_80base-kernel-modules kmod ./@MODULEDIR@/compat_80/compat_80.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_ossaudio base-kernel-modules kmod -./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_raid_50 base-kernel-modules kmod +./@MODULEDIR@/compat_raid_50/compat_raid_50.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_raid_80 base-kernel-modules kmod +./@MODULEDIR@/compat_raid_80/compat_raid_80.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_sysv_10 base-kernel-modules kmod ./@MODULEDIR@/compat_sysv_10/compat_sysv_10.kmod base-kernel-modules kmod ./@MODULEDIR@/compat_sysv_14 base-kernel-modules kmod Index: src/sys/compat/common/compat_50_mod.c diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.13 src/sys/compat/common/compat_50_mod.c:1.1.2.14 --- src/sys/compat/common/compat_50_mod.c:1.1.2.13 Sat Sep 22 04:56:28 2018 +++ src/sys/compat/common/compat_50_mod.c Sat Sep 22 22:21:46 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_50_mod.c,v 1.1.2.13 2018/09/22 04:56:28 pgoyette Exp $ */ +/* $NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.13 2018/09/22 04:56:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: compat_50_mo #include #include -#include - #include #include @@ -87,7 +85,6 @@ compat_50_init(void) clockctl_50_init(); if_spppsubr_50_init(); cryptodev_50_init(); - raidframe_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init(); @@ -114,7 +111,6 @@ compat_50_fini(void) vnd_50_fini(); wsevent_50_fini(); puffs_50_fini(); - raidframe_50_fini(); cryptodev_50_fini(); if_spppsubr_50_fini(); clockctl_50_fini(); @@ -152,7 +148,6 @@ compat_50_fini(void) clockctl_50_init(); if_spppsubr_50_init(); cryptodev_50_init(); - raidframe_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init(); Index: src/sys/compat/common/compat_80_mod.c diff -u src/sys/compat/common/compat_80_mod.c:1.1.2.10 src/sys/compat/common/compat_80_mod.c:1.1.2.11 --- src/sys/compat/common/compat_80_mod.c:1.1.2.10 Sat Sep 22 04:56:28 2018 +++ src/sys/compat/common/compat_80_mod.c Sat Sep 22 22:21:46 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_80_mod.c,v 1.1.2.10 2018/09/22 04:56:28 pgoyette Exp $ */ +/* $NetBSD: compat_80_mod.c,v 1.1.2.11 2018/09/22 22:21:46 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -38,20 +38,18 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.10 2018/09/22 04:56:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.11 2018/09/22
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src Committed By: jdolecek Date: Sat Sep 22 17:52:24 UTC 2018 Modified Files: src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq Log Message: one more To generate a diff of this commit: cvs rdiff -u -r1.4.2.7 -r1.4.2.8 src/sys/dev/ata/TODO.ncq 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/ata/TODO.ncq diff -u src/sys/dev/ata/TODO.ncq:1.4.2.7 src/sys/dev/ata/TODO.ncq:1.4.2.8 --- src/sys/dev/ata/TODO.ncq:1.4.2.7 Sat Sep 22 17:50:09 2018 +++ src/sys/dev/ata/TODO.ncq Sat Sep 22 17:52:24 2018 @@ -3,6 +3,7 @@ jdolecek-ncqfixes goals: triggers KASSERT() - fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY ends up being handled as NOERROR, triggering KASSERT() in wd(4) +- remove controller-specific slot bitmaps (ic/siisata.c, ic/ahcisata_core.c) Bugs
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Sat Sep 22 17:50:09 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq ata_subr.c atavar.h wd.c
wdvar.h
Log Message:
remove explicit ata_channel_start() calls, it's no longer necessary
now that ata_xfer's are allocated via pool and not really limited;
replace by just a callout to restart the processing for rare cases
where system runs out of memory
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.6 -r1.4.2.7 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/dev/ata/ata_subr.c
cvs rdiff -u -r1.99.2.6 -r1.99.2.7 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.441.2.5 -r1.441.2.6 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.46.6.3 -r1.46.6.4 src/sys/dev/ata/wdvar.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4.2.6 src/sys/dev/ata/TODO.ncq:1.4.2.7
--- src/sys/dev/ata/TODO.ncq:1.4.2.6 Sat Sep 22 16:14:25 2018
+++ src/sys/dev/ata/TODO.ncq Sat Sep 22 17:50:09 2018
@@ -1,6 +1,4 @@
jdolecek-ncqfixes goals:
-- add to wd(4) a callout to restart buf queue processing when ata_get_xfer()
- call fails and remove ata_channel_start()
- re-fix QEMU ahci(4) bug workaround (no READ LOG EXT support) - now it
triggers KASSERT()
- fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY
Index: src/sys/dev/ata/ata_subr.c
diff -u src/sys/dev/ata/ata_subr.c:1.6.2.5 src/sys/dev/ata/ata_subr.c:1.6.2.6
--- src/sys/dev/ata/ata_subr.c:1.6.2.5 Sat Sep 22 09:22:59 2018
+++ src/sys/dev/ata/ata_subr.c Sat Sep 22 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_subr.c,v 1.6.2.5 2018/09/22 09:22:59 jdolecek Exp $ */
+/* $NetBSD: ata_subr.c,v 1.6.2.6 2018/09/22 17:50:09 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.6.2.5 2018/09/22 09:22:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_subr.c,v 1.6.2.6 2018/09/22 17:50:09 jdolecek Exp $");
#include "opt_ata.h"
@@ -257,54 +257,6 @@ ata_timeout(void *v)
splx(s);
}
-/*
- * Must be called without any locks, i.e. with both drive and channel locks
- * released.
- */
-void
-ata_channel_start(struct ata_channel *chp, int drive, bool start_self)
-{
- int i, s;
- struct ata_drive_datas *drvp;
-
- s = splbio();
-
- KASSERT(chp->ch_ndrives > 0);
-
-#define ATA_DRIVE_START(chp, drive) \
- do { \
- KASSERT(drive < chp->ch_ndrives); \
- drvp = >ch_drive[drive]; \
-\
- if (drvp->drive_type != ATA_DRIVET_ATA && \
- drvp->drive_type != ATA_DRIVET_ATAPI && \
- drvp->drive_type != ATA_DRIVET_OLD) \
- continue;\
-\
- if (drvp->drv_start != NULL) \
- (*drvp->drv_start)(drvp->drv_softc); \
- } while (0)
-
- /*
- * Process drives in round robin fashion starting with next one after
- * the one which finished transfer. Thus no single drive would
- * completely starve other drives on same channel.
- * This loop processes all but the current drive, so won't do anything
- * if there is only one drive in channel.
- */
- for (i = (drive + 1) % chp->ch_ndrives; i != drive;
- i = (i + 1) % chp->ch_ndrives) {
- ATA_DRIVE_START(chp, i);
- }
-
- /* Now try to kick off xfers on the current drive */
- if (start_self)
- ATA_DRIVE_START(chp, drive);
-
- splx(s);
-#undef ATA_DRIVE_START
-}
-
void
ata_channel_lock(struct ata_channel *chp)
{
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.99.2.6 src/sys/dev/ata/atavar.h:1.99.2.7
--- src/sys/dev/ata/atavar.h:1.99.2.6 Sat Sep 22 16:14:25 2018
+++ src/sys/dev/ata/atavar.h Sat Sep 22 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.99.2.6 2018/09/22 16:14:25 jdolecek Exp $ */
+/* $NetBSD: atavar.h,v 1.99.2.7 2018/09/22 17:50:09 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -327,7 +327,6 @@ struct ata_drive_datas {
/* Callbacks into the drive's driver. */
void (*drv_done)(device_t, struct ata_xfer *); /* xfer is done */
- void (*drv_start)(device_t); /* start queue */
device_t drv_softc; /* ATA drives softc, if any */
struct ata_channel *chnl_softc; /* channel softc */
@@ -547,7 +546,6 @@ void ata_kill_active(struct ata_channel
void ata_reset_channel(struct ata_channel *, int);
void ata_channel_freeze(struct ata_channel *);
void ata_channel_thaw(struct ata_channel *);
-void ata_channel_start(struct ata_channel *, int, bool);
void ata_channel_lock(struct ata_channel *);
void ata_channel_unlock(struct ata_channel *);
void ata_channel_lock_owned(struct ata_channel *);
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.441.2.5 src/sys/dev/ata/wd.c:1.441.2.6
--- src/sys/dev/ata/wd.c:1.441.2.5 Sat Sep 22 16:14:25 2018
+++ src/sys/dev/ata/wd.c Sat Sep 22 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.441.2.5 2018/09/22
CVS commit: src/sys/external/bsd/libnv/dist
Module Name:src
Committed By: rmind
Date: Sat Sep 22 17:13:30 UTC 2018
Modified Files:
src/sys/external/bsd/libnv/dist: nv_impl.h nv_kern_netbsd.c nvlist.c
Log Message:
libnv: fix some NetBSD wrappers.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/libnv/dist/nv_impl.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/libnv/dist/nvlist.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/external/bsd/libnv/dist/nv_impl.h
diff -u src/sys/external/bsd/libnv/dist/nv_impl.h:1.3 src/sys/external/bsd/libnv/dist/nv_impl.h:1.4
--- src/sys/external/bsd/libnv/dist/nv_impl.h:1.3 Sat Sep 8 14:12:53 2018
+++ src/sys/external/bsd/libnv/dist/nv_impl.h Sat Sep 22 17:13:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nv_impl.h,v 1.3 2018/09/08 14:12:53 christos Exp $ */
+/* $NetBSD: nv_impl.h,v 1.4 2018/09/22 17:13:30 rmind Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -82,11 +82,11 @@ extern char *nv_strdup(const char *);
#else /* USERLAND */
# define nv_malloc(size) malloc((size))
-# define nv_calloc(n, size) calloc(n, size)
# define nv_realloc(buf, size) realloc((buf), (size))
# define nv_free(buf) free((buf))
-# define nv_strdup(buf) strdup(buf)
# define nv_vasprintf(ptr, ...) vasprintf(ptr, __VA_ARGS__)
+void *nv_calloc(size_t, size_t);
+char *nv_strdup(const char *);
# define ERRNO_SET(var) do {\
errno = (var); \
Index: src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c
diff -u src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.2 src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.3
--- src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c:1.2 Sat Sep 8 14:12:53 2018
+++ src/sys/external/bsd/libnv/dist/nv_kern_netbsd.c Sat Sep 22 17:13:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nv_kern_netbsd.c,v 1.2 2018/09/08 14:12:53 christos Exp $ */
+/* $NetBSD: nv_kern_netbsd.c,v 1.3 2018/09/22 17:13:30 rmind Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.2 2018/09/08 14:12:53 christos Exp $");
+__RCSID("$NetBSD: nv_kern_netbsd.c,v 1.3 2018/09/22 17:13:30 rmind Exp $");
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include
@@ -198,11 +198,11 @@ nvlist_recv_ioctl(int fd, unsigned long
void *
nv_calloc(size_t n, size_t s)
{
- n *= s;
- void *buf = nv_malloc(n);
+ const size_t len = n * s;
+ void *buf = nv_malloc(len);
if (buf == NULL)
return NULL;
- memset(buf, 0, n);
+ memset(buf, 0, len);
return buf;
}
Index: src/sys/external/bsd/libnv/dist/nvlist.c
diff -u src/sys/external/bsd/libnv/dist/nvlist.c:1.5 src/sys/external/bsd/libnv/dist/nvlist.c:1.6
--- src/sys/external/bsd/libnv/dist/nvlist.c:1.5 Tue Sep 11 02:20:31 2018
+++ src/sys/external/bsd/libnv/dist/nvlist.c Sat Sep 22 17:13:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nvlist.c,v 1.5 2018/09/11 02:20:31 christos Exp $ */
+/* $NetBSD: nvlist.c,v 1.6 2018/09/22 17:13:30 rmind Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -36,7 +36,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/contrib/libnv/nvlist.c 335347 2018-06-18 22:57:32Z oshogbo $");
#else
-__RCSID("$NetBSD: nvlist.c,v 1.5 2018/09/11 02:20:31 christos Exp $");
+__RCSID("$NetBSD: nvlist.c,v 1.6 2018/09/22 17:13:30 rmind Exp $");
#endif
#include
@@ -1180,7 +1180,7 @@ nvlist_xunpack(const void *buf, size_t s
goto fail;
nvlist_set_parent(tmpnvl, nvp);
break;
-#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if !defined(_KERNEL) && !defined(_STANDALONE) && !defined(__NetBSD__)
case NV_TYPE_DESCRIPTOR:
ptr = nvpair_unpack_descriptor(isbe, nvp, ptr, ,
fds, nfds);
CVS commit: src
Module Name:src Committed By: maxv Date: Sat Sep 22 16:22:24 UTC 2018 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/amiga/conf: files.amiga src/sys/arch/amigappc/conf: files.amigappc src/sys/arch/i386/conf: ALL src/sys/conf: files src/sys/dev: DEVNAMES src/sys/dev/isa: files.isa src/sys/dev/isapnp: files.isapnp src/sys/dev/pci: files.pci src/sys/dev/pcmcia: files.pcmcia Removed Files: src/share/man/man4: isic.4 src/sys/arch/amiga/conf: ISDN src/sys/arch/amiga/dev: aster.c isic_supio.c src/sys/arch/i386/conf: GENERIC_ISDN src/sys/dev/ic: hscx.c hscx.h ipac.h isac.c isac.h isacsx.c isacsx.h isic.c isic_bchan.c isic_l1.c isic_l1.h isic_l1fsm.c src/sys/dev/isa: isic_isa.c isic_isa_avm_a1.c isic_isa_itk_ix1.c isic_isa_tel_s016.c isic_isa_tel_s0163.c isic_isa_tel_s08.c isic_isa_usr_sti.c src/sys/dev/isapnp: isic_isapnp.c isic_isapnp_ctx_s0P.c isic_isapnp_drn_ngo.c isic_isapnp_dynalink.c isic_isapnp_elsa_qs1i.c isic_isapnp_itkix.c isic_isapnp_siemens_isurf.c isic_isapnp_sws.c isic_isapnp_tel_s0P.c src/sys/dev/pci: isic_pci.c isic_pci.h isic_pci_elsa_qs1p.c src/sys/dev/pcmcia: isic_pcmcia.c isic_pcmcia.h isic_pcmcia_avm_fritz.c isic_pcmcia_elsa_isdnmc.c isic_pcmcia_elsa_mcall.c isic_pcmcia_sbspeedstar2.c Log Message: Remove isic(4). It is part of ISDN, which we are now retiring. To generate a diff of this commit: cvs rdiff -u -r1.1622 -r1.1623 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.670 -r1.671 src/share/man/man4/Makefile cvs rdiff -u -r1.18 -r0 src/share/man/man4/isic.4 cvs rdiff -u -r1.105 -r1.106 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.5 -r0 src/sys/arch/amiga/conf/ISDN cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r1.23 -r0 src/sys/arch/amiga/dev/aster.c cvs rdiff -u -r1.19 -r0 src/sys/arch/amiga/dev/isic_supio.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amigappc/conf/files.amigappc cvs rdiff -u -r1.455 -r1.456 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.20 -r0 src/sys/arch/i386/conf/GENERIC_ISDN cvs rdiff -u -r1.1211 -r1.1212 src/sys/conf/files cvs rdiff -u -r1.316 -r1.317 src/sys/dev/DEVNAMES cvs rdiff -u -r1.16 -r0 src/sys/dev/ic/hscx.c cvs rdiff -u -r1.4 -r0 src/sys/dev/ic/hscx.h src/sys/dev/ic/ipac.h \ src/sys/dev/ic/isac.h cvs rdiff -u -r1.24 -r0 src/sys/dev/ic/isac.c cvs rdiff -u -r1.7 -r0 src/sys/dev/ic/isacsx.c cvs rdiff -u -r1.5 -r0 src/sys/dev/ic/isacsx.h cvs rdiff -u -r1.25 -r0 src/sys/dev/ic/isic.c cvs rdiff -u -r1.15 -r0 src/sys/dev/ic/isic_bchan.c cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/isic_l1.c cvs rdiff -u -r1.21 -r0 src/sys/dev/ic/isic_l1.h cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/isic_l1fsm.c cvs rdiff -u -r1.170 -r1.171 src/sys/dev/isa/files.isa cvs rdiff -u -r1.38 -r0 src/sys/dev/isa/isic_isa.c cvs rdiff -u -r1.10 -r0 src/sys/dev/isa/isic_isa_avm_a1.c cvs rdiff -u -r1.18 -r0 src/sys/dev/isa/isic_isa_itk_ix1.c cvs rdiff -u -r1.9 -r0 src/sys/dev/isa/isic_isa_tel_s016.c \ src/sys/dev/isa/isic_isa_tel_s08.c cvs rdiff -u -r1.13 -r0 src/sys/dev/isa/isic_isa_tel_s0163.c cvs rdiff -u -r1.8 -r0 src/sys/dev/isa/isic_isa_usr_sti.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/isapnp/files.isapnp cvs rdiff -u -r1.33 -r0 src/sys/dev/isapnp/isic_isapnp.c cvs rdiff -u -r1.11 -r0 src/sys/dev/isapnp/isic_isapnp_ctx_s0P.c \ src/sys/dev/isapnp/isic_isapnp_siemens_isurf.c \ src/sys/dev/isapnp/isic_isapnp_tel_s0P.c cvs rdiff -u -r1.10 -r0 src/sys/dev/isapnp/isic_isapnp_drn_ngo.c cvs rdiff -u -r1.14 -r0 src/sys/dev/isapnp/isic_isapnp_dynalink.c \ src/sys/dev/isapnp/isic_isapnp_sws.c cvs rdiff -u -r1.16 -r0 src/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c cvs rdiff -u -r1.8 -r0 src/sys/dev/isapnp/isic_isapnp_itkix.c cvs rdiff -u -r1.406 -r1.407 src/sys/dev/pci/files.pci cvs rdiff -u -r1.41 -r0 src/sys/dev/pci/isic_pci.c cvs rdiff -u -r1.11 -r0 src/sys/dev/pci/isic_pci.h cvs rdiff -u -r1.20 -r0 src/sys/dev/pci/isic_pci_elsa_qs1p.c cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pcmcia/files.pcmcia cvs rdiff -u -r1.43 -r0 src/sys/dev/pcmcia/isic_pcmcia.c cvs rdiff -u -r1.6 -r0 src/sys/dev/pcmcia/isic_pcmcia.h cvs rdiff -u -r1.12 -r0 src/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c cvs rdiff -u -r1.14 -r0 src/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c cvs rdiff -u -r1.15 -r0 src/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c cvs rdiff -u -r1.13 -r0 src/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1622 src/distrib/sets/lists/man/mi:1.1623 --- src/distrib/sets/lists/man/mi:1.1622 Sat Sep 22 12:41:00 2018 +++ src/distrib/sets/lists/man/mi Sat
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Sat Sep 22 16:14:25 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq ata.c atavar.h wd.c
wdvar.h
Log Message:
fix use-after-free in wd(4) dump, detected by switch to the pool
change code in wd_dumpblocks() to use it's own non-pool ata_xfer,
which skips the deallocation step and thus keeps the contents when the I/O
is finished
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.5 -r1.4.2.6 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.141.6.8 -r1.141.6.9 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.99.2.5 -r1.99.2.6 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.441.2.4 -r1.441.2.5 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.46.6.2 -r1.46.6.3 src/sys/dev/ata/wdvar.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4.2.5 src/sys/dev/ata/TODO.ncq:1.4.2.6
--- src/sys/dev/ata/TODO.ncq:1.4.2.5 Sat Sep 22 09:26:48 2018
+++ src/sys/dev/ata/TODO.ncq Sat Sep 22 16:14:25 2018
@@ -1,8 +1,6 @@
jdolecek-ncqfixes goals:
- add to wd(4) a callout to restart buf queue processing when ata_get_xfer()
call fails and remove ata_channel_start()
-- change wd(4) dump code to use preallocated or on-stack ata_xfer to not rely
- on pool having memory
- re-fix QEMU ahci(4) bug workaround (no READ LOG EXT support) - now it
triggers KASSERT()
- fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.8 src/sys/dev/ata/ata.c:1.141.6.9
--- src/sys/dev/ata/ata.c:1.141.6.8 Sat Sep 22 12:20:31 2018
+++ src/sys/dev/ata/ata.c Sat Sep 22 16:14:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.9 2018/09/22 16:14:25 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.9 2018/09/22 16:14:25 jdolecek Exp $");
#include "opt_ata.h"
@@ -1350,7 +1350,7 @@ ata_free_xfer(struct ata_channel *chp, s
ata_channel_lock(chp);
- if (xfer->c_flags & (C_WAITACT|C_WAITTIMO)) {
+ if (__predict_false(xfer->c_flags & (C_WAITACT|C_WAITTIMO))) {
/* Someone is waiting for this xfer, so we can't free now */
xfer->c_flags |= C_FREE;
cv_broadcast(>c_active);
@@ -1360,7 +1360,7 @@ ata_free_xfer(struct ata_channel *chp, s
/* XXX move PIOBM and free_gw to deactivate? */
#if NATA_PIOBM /* XXX wdc dependent code */
- if (xfer->c_flags & C_PIOBM) {
+ if (__predict_false(xfer->c_flags & C_PIOBM)) {
struct wdc_softc *wdc = CHAN_TO_WDC(chp);
/* finish the busmastering PIO */
@@ -1375,7 +1375,8 @@ ata_free_xfer(struct ata_channel *chp, s
ata_channel_unlock(chp);
- pool_put(_xfer_pool, xfer);
+ if (__predict_true(!ISSET(xfer->c_flags, C_PRIVATE_ALLOC)))
+ pool_put(_xfer_pool, xfer);
}
void
Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.99.2.5 src/sys/dev/ata/atavar.h:1.99.2.6
--- src/sys/dev/ata/atavar.h:1.99.2.5 Sat Sep 22 09:22:59 2018
+++ src/sys/dev/ata/atavar.h Sat Sep 22 16:14:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.99.2.5 2018/09/22 09:22:59 jdolecek Exp $ */
+/* $NetBSD: atavar.h,v 1.99.2.6 2018/09/22 16:14:25 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -198,6 +198,7 @@ struct ata_xfer_ops {
#define C_WAITTIMO 0x0400 /* race vs. timeout */
#define C_CHAOS 0x0800 /* forced error xfer */
#define C_RECOVERED 0x1000 /* error recovered, no need for reset */
+#define C_PRIVATE_ALLOC 0x2000 /* private alloc, skip pool_put() */
/* reasons for c_kill_xfer() */
#define KILL_GONE 1 /* device is gone while xfer was active */
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.441.2.4 src/sys/dev/ata/wd.c:1.441.2.5
--- src/sys/dev/ata/wd.c:1.441.2.4 Sat Sep 22 09:22:59 2018
+++ src/sys/dev/ata/wd.c Sat Sep 22 16:14:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.441.2.4 2018/09/22 09:22:59 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.441.2.5 2018/09/22 16:14:25 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.441.2.4 2018/09/22 09:22:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.441.2.5 2018/09/22 16:14:25 jdolecek Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -1458,7 +1458,7 @@ wd_dumpblocks(device_t dev, void *va, da
struct wd_softc *wd = device_private(dev);
struct dk_softc *dksc = >sc_dksc;
struct disk_geom *dg = >sc_dkdev.dk_geom;
- struct ata_xfer *xfer;
+ struct ata_xfer *xfer = >dump_xfer;
int err;
/* Recalibrate, if first dump transfer. */
@@ -1469,11 +1469,8 @@ wd_dumpblocks(device_t dev, void *va, da
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Sat Sep 22 13:48:22 UTC 2018
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
Avoid use of test -o for when this is used as part of an INSTALL system
and the SMALL test does not support -o
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.192 src/etc/MAKEDEV.tmpl:1.193
--- src/etc/MAKEDEV.tmpl:1.192 Sat Jul 28 14:13:13 2018
+++ src/etc/MAKEDEV.tmpl Sat Sep 22 13:48:22 2018
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.192 2018/07/28 14:13:13 sevan Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.193 2018/09/22 13:48:22 kre Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2229,7 +2229,7 @@ nvme[0-9]*ns[0-9]*)
unit=${i#nvme}
unit=${unit%ns*}
subunit=${i#nvme${unit}ns}
- if [ 0$subunit -le 0 -o 0$subunit -ge 65536 ]; then
+ if [ 0$subunit -le 0 ] || [ 0$subunit -ge 65536 ]; then
warn "bad nsid for $i: $subunit"
break
fi
CVS commit: src/external/bsd/dhcpcd/dist/hooks
Module Name:src
Committed By: kre
Date: Sat Sep 22 13:17:46 UTC 2018
Modified Files:
src/external/bsd/dhcpcd/dist/hooks: 20-resolv.conf 29-lookup-hostname
30-hostname 50-ntp.conf 50-yp.conf 50-ypbind.in dhcpcd-run-hooks.in
Log Message:
PR install/53622 (probably)
When used as part of a network based install kernel, the SMALL "test" (aka [)
does not support -a or -o, so rewrite these scripts to avoid using that.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf \
src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname \
src/external/bsd/dhcpcd/dist/hooks/30-hostname \
src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf \
src/external/bsd/dhcpcd/dist/hooks/50-yp.conf \
src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in
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/dhcpcd/dist/hooks/20-resolv.conf
diff -u src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf:1.1.1.2 src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf:1.2
--- src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf:1.1.1.2 Mon Jan 29 11:11:23 2018
+++ src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf Sat Sep 22 13:17:46 2018
@@ -77,19 +77,19 @@ build_resolv_conf()
eval_nd_dns()
{
eval ltime=\$nd${i}_rdnss${j}_lifetime
- if [ -z "$ltime" -o "$ltime" = 0 ]; then
+ if [ -z "$ltime" ] || [ "$ltime" = 0 ]; then
rdnss=
else
eval rdnss=\$nd${i}_rdnss${j}_servers
fi
eval ltime=\$nd${i}_dnssl${j}_lifetime
- if [ -z "$ltime" -o "$ltime" = 0 ]; then
+ if [ -z "$ltime" ] || [ "$ltime" = 0 ]; then
dnssl=
else
eval dnssl=\$nd${i}_dnssl${j}_search
fi
- [ -z "$rdnss" -a -z "$dnssl" ] && return 1
+ [ -z "${rdnss}${dnssl}" ] && return 1
[ -n "$rdnss" ] && new_rdnss="$new_rdnss${new_rdnss:+ }$rdnss"
[ -n "$dnssl" ] && new_dnssl="$new_dnssl${new_dnssl:+ }$dnssl"
@@ -130,9 +130,9 @@ add_resolv_conf()
fi
# If we don't have any configuration, remove it
- if [ -z "$new_domain_name_servers" -a \
- -z "$new_domain_name" -a \
- -z "$new_domain_search" ]; then
+ if [ -z "$new_domain_name_servers" ] &&
+ [ -z "$new_domain_name" ] &&
+ [ -z "$new_domain_search" ]; then
remove_resolv_conf
return $?
fi
Index: src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname
diff -u src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname:1.1.1.2 src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname:1.2
--- src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname:1.1.1.2 Mon Jan 29 11:11:23 2018
+++ src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname Sat Sep 22 13:17:46 2018
@@ -29,7 +29,7 @@ lookup_hostname()
set_hostname()
{
- if [ -z "$new_host_name" -a -z "$new_fqdn_name" ]; then
+ if [ -z "${new_host_name}${new_fqdn_name}" ]; then
export new_host_name="$(lookup_hostname)"
fi
}
Index: src/external/bsd/dhcpcd/dist/hooks/30-hostname
diff -u src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.1.1.2 src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.2
--- src/external/bsd/dhcpcd/dist/hooks/30-hostname:1.1.1.2 Mon Jan 29 11:11:23 2018
+++ src/external/bsd/dhcpcd/dist/hooks/30-hostname Sat Sep 22 13:17:46 2018
@@ -87,8 +87,8 @@ need_hostname()
fi
elif [ -n "$old_host_name" ]; then
if ${hfqdn}; then
- if [ -n "$old_domain_name" -a \
- "$old_host_name" = "${old_host_name#*.}" ]
+ if [ -n "$old_domain_name" ] &&
+ [ "$old_host_name" = "${old_host_name#*.}" ]
then
[ "$hostname" = \
"$old_host_name.$old_domain_name" ]
@@ -131,8 +131,8 @@ set_hostname()
fi
elif [ -n "$new_host_name" ]; then
if ${hfqdn}; then
- if [ -n "$new_domain_name" -a \
- "$new_host_name" = "${new_host_name#*.}" ]
+ if [ -n "$new_domain_name" ] &&
+ [ "$new_host_name" = "${new_host_name#*.}" ]
then
try_hostname "$new_host_name.$new_domain_name"
else
Index: src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf
diff -u src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf:1.1.1.2 src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf:1.2
--- src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf:1.1.1.2 Mon Jan 29 11:11:23 2018
+++ src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf Sat Sep 22 13:17:46 2018
@@ -96,7 +96,7 @@ build_ntp_conf()
printf %s "$servers" >> "$cf"
echo "$signature_base_end${header:+ $from }$header" >> "$cf"
else
- [ -e "$ntp_conf" -a -e "$cf" ] || return
+ [ -e "$ntp_conf" ] && [ -e "$cf" ] || return
fi
# If we changed anything, restart ntpd
Index: src/external/bsd/dhcpcd/dist/hooks/50-yp.conf
diff -u src/external/bsd/dhcpcd/dist/hooks/50-yp.conf:1.1.1.2 src/external/bsd/dhcpcd/dist/hooks/50-yp.conf:1.2
--- src/external/bsd/dhcpcd/dist/hooks/50-yp.conf:1.1.1.2 Mon Jan 29 11:11:23 2018
+++ src/external/bsd/dhcpcd/dist/hooks/50-yp.conf Sat Sep 22 13:17:46 2018
@@ -8,7 +8,7 @@ ypbind_pid()
CVS commit: src/sys/dev/pci
Module Name:src Committed By: maxv Date: Sat Sep 22 12:56:16 UTC 2018 Modified Files: src/sys/dev/pci: files.pci Log Message: Unreference iwic (now removed), forgot that. To generate a diff of this commit: cvs rdiff -u -r1.405 -r1.406 src/sys/dev/pci/files.pci 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/files.pci diff -u src/sys/dev/pci/files.pci:1.405 src/sys/dev/pci/files.pci:1.406 --- src/sys/dev/pci/files.pci:1.405 Sat Sep 22 12:26:27 2018 +++ src/sys/dev/pci/files.pci Sat Sep 22 12:56:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.405 2018/09/22 12:26:27 maxv Exp $ +# $NetBSD: files.pci,v 1.406 2018/09/22 12:56:16 maxv Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -813,14 +813,6 @@ file dev/pci/isic_pci.c isic_pci file dev/pci/isic_pci_elsa_qs1p.c isic_pci -# Winbond W6692 -device iwic: isdndev, passive_isdn -attach iwic at pci with iwic_pci -file dev/pci/iwic_pci.c iwic -file dev/pci/iwic_bchan.c iwic -file dev/pci/iwic_dchan.c iwic -file dev/pci/iwic_fsm.c iwic - # IrDA devices # Toshiba Fast Infrared Type O IrDA driver device oboe: irbus, irdasir
CVS commit: src
Module Name:src Committed By: rmind Date: Sat Sep 22 12:54:34 UTC 2018 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi src/sys/rump/kern: Makefile.rumpkerncomp Added Files: src/sys/rump/kern/lib/libnv: Makefile Log Message: Add rumpkern_nv (in-kernel RUMP libnv). To generate a diff of this commit: cvs rdiff -u -r1.847 -r1.848 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2228 -r1.2229 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.321 -r1.322 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.12 -r1.13 src/sys/rump/kern/Makefile.rumpkerncomp cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libnv/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.847 src/distrib/sets/lists/base/shl.mi:1.848 --- src/distrib/sets/lists/base/shl.mi:1.847 Mon Sep 3 15:30:36 2018 +++ src/distrib/sets/lists/base/shl.mi Sat Sep 22 12:54:34 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.847 2018/09/03 15:30:36 christos Exp $ +# $NetBSD: shl.mi,v 1.848 2018/09/22 12:54:34 rmind Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -689,6 +689,9 @@ ./usr/lib/librumpkern_ksem.so base-obsolete obsolete ./usr/lib/librumpkern_ksem.so.0 base-obsolete obsolete ./usr/lib/librumpkern_ksem.so.0.0 base-obsolete obsolete +./usr/lib/librumpkern_nv.so base-rump-shlib rump +./usr/lib/librumpkern_nv.so.0 base-rump-shlib rump +./usr/lib/librumpkern_nv.so.0.0 base-rump-shlib rump ./usr/lib/librumpkern_sljit.so base-rump-shlib rump,sljit ./usr/lib/librumpkern_sljit.so.0 base-rump-shlib rump,sljit ./usr/lib/librumpkern_sljit.so.0.0 base-rump-shlib rump,sljit Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2228 src/distrib/sets/lists/comp/mi:1.2229 --- src/distrib/sets/lists/comp/mi:1.2228 Thu Sep 6 19:19:44 2018 +++ src/distrib/sets/lists/comp/mi Sat Sep 22 12:54:34 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2228 2018/09/06 19:19:44 maxv Exp $ +# $NetBSD: mi,v 1.2229 2018/09/22 12:54:34 rmind Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3647,6 +3647,8 @@ ./usr/lib/librumpkern_crypto_p.a comp-c-proflib rump,profile ./usr/lib/librumpkern_ksem.a comp-obsolete obsolete ./usr/lib/librumpkern_ksem_p.a comp-obsolete obsolete +./usr/lib/librumpkern_nv.a comp-c-lib rump +./usr/lib/librumpkern_nv_p.a comp-c-proflib rump,profile ./usr/lib/librumpkern_sljit.a comp-c-lib rump,sljit ./usr/lib/librumpkern_sljit_p.a comp-c-proflib rump,sljit,profile ./usr/lib/librumpkern_solaris.a comp-c-lib rump,zfs Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.321 src/distrib/sets/lists/comp/shl.mi:1.322 --- src/distrib/sets/lists/comp/shl.mi:1.321 Mon Aug 13 08:26:49 2018 +++ src/distrib/sets/lists/comp/shl.mi Sat Sep 22 12:54:34 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.321 2018/08/13 08:26:49 christos Exp $ +# $NetBSD: shl.mi,v 1.322 2018/09/22 12:54:34 rmind Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -213,6 +213,7 @@ ./usr/lib/librumphijack_pic.a comp-c-piclib compatfile,picinstall,rump ./usr/lib/librumpkern_crypto_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete +./usr/lib/librumpkern_nv_pic.a comp-c-piclib picinstall,rump ./usr/lib/librumpkern_sljit_pic.a comp-c-piclib picinstall,rump,sljit ./usr/lib/librumpkern_solaris_pic.a comp-c-piclib picinstall,rump,zfs ./usr/lib/librumpkern_sysproxy_pic.a comp-c-piclib picinstall,rump Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.265 src/distrib/sets/lists/debug/mi:1.266 --- src/distrib/sets/lists/debug/mi:1.265 Wed Sep 19 13:58:26 2018 +++ src/distrib/sets/lists/debug/mi Sat Sep 22 12:54:34 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.265 2018/09/19 13:58:26 maxv Exp $ +# $NetBSD: mi,v 1.266 2018/09/22 12:54:34 rmind Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -202,6 +202,7 @@ ./usr/lib/librumphijack_g.a comp-c-debuglib debuglib,compatfile,rump ./usr/lib/librumpkern_crypto_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpkern_ksem_g.a comp-obsolete obsolete,compatfile +./usr/lib/librumpkern_nv_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpkern_sljit_g.a comp-c-debuglib debuglib,rump,sljit ./usr/lib/librumpkern_solaris_g.a
CVS commit: src
Module Name:src Committed By: maxv Date: Sat Sep 22 12:41:01 UTC 2018 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL GENERIC_ISDN src/sys/dev: DEVNAMES Removed Files: src/share/man/man4: iwic.4 src/sys/dev/pci: iwic_bchan.c iwic_dchan.c iwic_fsm.c iwic_pci.c iwicreg.h iwicvar.h Log Message: Remove iwic(4). It is part of ISDN, which we are now retiring. This driver was still marked as experimental (its man page dates back to 2002). To generate a diff of this commit: cvs rdiff -u -r1.1621 -r1.1622 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.669 -r1.670 src/share/man/man4/Makefile cvs rdiff -u -r1.6 -r0 src/share/man/man4/iwic.4 cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.454 -r1.455 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/GENERIC_ISDN cvs rdiff -u -r1.315 -r1.316 src/sys/dev/DEVNAMES cvs rdiff -u -r1.10 -r0 src/sys/dev/pci/iwic_bchan.c \ src/sys/dev/pci/iwic_dchan.c cvs rdiff -u -r1.4 -r0 src/sys/dev/pci/iwic_fsm.c cvs rdiff -u -r1.20 -r0 src/sys/dev/pci/iwic_pci.c cvs rdiff -u -r1.2 -r0 src/sys/dev/pci/iwicreg.h cvs rdiff -u -r1.6 -r0 src/sys/dev/pci/iwicvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1621 src/distrib/sets/lists/man/mi:1.1622 --- src/distrib/sets/lists/man/mi:1.1621 Sat Sep 22 12:19:11 2018 +++ src/distrib/sets/lists/man/mi Sat Sep 22 12:41:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1621 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: mi,v 1.1622 2018/09/22 12:41:00 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1359,7 +1359,7 @@ ./usr/share/man/cat4/iteide.0 man-sys-catman .cat ./usr/share/man/cat4/itesio.0 man-sys-catman .cat ./usr/share/man/cat4/iwi.0 man-sys-catman .cat -./usr/share/man/cat4/iwic.0 man-sys-catman .cat +./usr/share/man/cat4/iwic.0 man-obsolete obsolete ./usr/share/man/cat4/iwm.0 man-sys-catman .cat ./usr/share/man/cat4/iwn.0 man-sys-catman .cat ./usr/share/man/cat4/ix.0 man-sys-catman .cat @@ -4476,7 +4476,7 @@ ./usr/share/man/html4/iteide.html man-sys-htmlman html ./usr/share/man/html4/itesio.html man-sys-htmlman html ./usr/share/man/html4/iwi.html man-sys-htmlman html -./usr/share/man/html4/iwic.html man-sys-htmlman html +./usr/share/man/html4/iwic.html man-obsolete obsolete ./usr/share/man/html4/iwm.html man-sys-htmlman html ./usr/share/man/html4/iwn.html man-sys-htmlman html ./usr/share/man/html4/ix.html man-sys-htmlman html @@ -7433,7 +7433,7 @@ ./usr/share/man/man4/iteide.4 man-sys-man .man ./usr/share/man/man4/itesio.4 man-sys-man .man ./usr/share/man/man4/iwi.4 man-sys-man .man -./usr/share/man/man4/iwic.4 man-sys-man .man +./usr/share/man/man4/iwic.4 man-obsolete obsolete ./usr/share/man/man4/iwm.4 man-sys-man .man ./usr/share/man/man4/iwn.4 man-sys-man .man ./usr/share/man/man4/ix.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.669 src/share/man/man4/Makefile:1.670 --- src/share/man/man4/Makefile:1.669 Sat Sep 22 12:19:11 2018 +++ src/share/man/man4/Makefile Sat Sep 22 12:41:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.669 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: Makefile,v 1.670 2018/09/22 12:41:00 maxv Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -146,7 +146,7 @@ MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6. # ISDN devices MAN+= isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \ - isic.4 iwic.4 isdncapi.4 + isic.4 isdncapi.4 # onewire bus and devices MAN+= gpioow.4 onewire.4 owtemp.4 Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.104 src/sys/arch/amd64/conf/ALL:1.105 --- src/sys/arch/amd64/conf/ALL:1.104 Sat Sep 22 12:26:27 2018 +++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:41:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.104 2018/09/22 12:26:27 maxv Exp $ +# $NetBSD: ALL,v 1.105 2018/09/22 12:41:00 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.104 $" +#ident "ALL-$Revision: 1.105 $" maxusers 64 # estimated number of users @@ -1753,9 +1753,6 @@ options ISICISA_ITKIX1 # isic* at pci? -# Winbond W6692 -iwic* at pci? - # #- # Supported PCMCIA cards: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.454 src/sys/arch/i386/conf/ALL:1.455 ---
CVS commit: src/sys
Module Name:src Committed By: maxv Date: Sat Sep 22 12:26:27 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL GENERIC_ISDN src/sys/conf: files src/sys/dev/pci: files.pci Removed Files: src/sys/dev/pci: ifpci2.c Log Message: Remove the "ifritz" driver (no man page). It is part of ISDN, which we are retiring. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.453 -r1.454 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/GENERIC_ISDN cvs rdiff -u -r1.1210 -r1.1211 src/sys/conf/files cvs rdiff -u -r1.404 -r1.405 src/sys/dev/pci/files.pci cvs rdiff -u -r1.22 -r0 src/sys/dev/pci/ifpci2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.103 src/sys/arch/amd64/conf/ALL:1.104 --- src/sys/arch/amd64/conf/ALL:1.103 Sat Sep 22 12:19:11 2018 +++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:26:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.103 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: ALL,v 1.104 2018/09/22 12:26:27 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.103 $" +#ident "ALL-$Revision: 1.104 $" maxusers 64 # estimated number of users @@ -1756,9 +1756,6 @@ isic* at pci? # Winbond W6692 iwic* at pci? -# AVM Fritz!PCI V2 card -ifritz* at pci? - # #- # Supported PCMCIA cards: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.453 src/sys/arch/i386/conf/ALL:1.454 --- src/sys/arch/i386/conf/ALL:1.453 Sat Sep 22 12:19:11 2018 +++ src/sys/arch/i386/conf/ALL Sat Sep 22 12:26:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.453 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: ALL,v 1.454 2018/09/22 12:26:27 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.453 $" +#ident "ALL-$Revision: 1.454 $" maxusers 64 # estimated number of users @@ -1902,9 +1902,6 @@ isic* at pci? # Winbond W6692 iwic* at pci? -# AVM Fritz!PCI V2 card -ifritz* at pci? - # #- # Supported PCMCIA cards: Index: src/sys/arch/i386/conf/GENERIC_ISDN diff -u src/sys/arch/i386/conf/GENERIC_ISDN:1.18 src/sys/arch/i386/conf/GENERIC_ISDN:1.19 --- src/sys/arch/i386/conf/GENERIC_ISDN:1.18 Sat Sep 22 12:19:11 2018 +++ src/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:26:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_ISDN,v 1.18 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: GENERIC_ISDN,v 1.19 2018/09/22 12:26:27 maxv Exp $ # # GENERIC kernel with all supported ISDN devices and drivers @@ -54,9 +54,6 @@ isic* at pci? # Winbond W6692 iwic* at pci? -# AVM Fritz!PCI V2 card -ifritz* at pci? - # #- # Supported PCMCIA cards: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1210 src/sys/conf/files:1.1211 --- src/sys/conf/files:1.1210 Sat Sep 22 12:19:11 2018 +++ src/sys/conf/files Sat Sep 22 12:26:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1210 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: files,v 1.1211 2018/09/22 12:26:27 maxv Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1377,8 +1377,8 @@ file dev/ic/isac.c nisac needs-flag device isic: isdndev, passive_isdn, nisac file dev/ic/isic.c isic -file dev/ic/isic_l1.c isic|ifritz -file dev/ic/isic_l1fsm.c isic|ifritz +file dev/ic/isic_l1.c isic +file dev/ic/isic_l1fsm.c isic file dev/ic/hscx.c isic file dev/ic/isic_bchan.c isic Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.404 src/sys/dev/pci/files.pci:1.405 --- src/sys/dev/pci/files.pci:1.404 Sat Sep 22 12:19:11 2018 +++ src/sys/dev/pci/files.pci Sat Sep 22 12:26:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.404 2018/09/22 12:19:11 maxv Exp $ +# $NetBSD: files.pci,v 1.405 2018/09/22 12:26:27 maxv Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -813,10 +813,6 @@ file dev/pci/isic_pci.c isic_pci file dev/pci/isic_pci_elsa_qs1p.c isic_pci -device ifritz: isdndev, passive_isdn, nisacsx -attach ifritz at pci -file dev/pci/ifpci2.c ifritz - # Winbond W6692 device iwic: isdndev, passive_isdn attach iwic at pci with iwic_pci
CVS commit: src/sys
Module Name:src Committed By: rin Date: Sat Sep 22 12:24:04 UTC 2018 Modified Files: src/sys/arch/aarch64/conf: Makefile.aarch64 src/sys/arch/acorn32/conf: Makefile.acorn32 src/sys/arch/alpha/conf: Makefile.alpha src/sys/arch/amd64/conf: Makefile.amd64 src/sys/arch/amiga/conf: Makefile.amiga src/sys/arch/arm/conf: Makefile.arm src/sys/arch/atari/conf: Makefile.atari src/sys/arch/cesfic/conf: Makefile.cesfic src/sys/arch/hp300/conf: Makefile.hp300 src/sys/arch/hpcarm/conf: Makefile.hpcarm src/sys/arch/hppa/conf: Makefile.hppa src/sys/arch/i386/conf: Makefile.i386 src/sys/arch/ia64/conf: Makefile.ia64 src/sys/arch/luna68k/conf: Makefile.luna68k src/sys/arch/mac68k/conf: Makefile.mac68k src/sys/arch/mips/conf: Makefile.mips src/sys/arch/mvme68k/conf: Makefile.mvme68k src/sys/arch/news68k/conf: Makefile.news68k src/sys/arch/next68k/conf: Makefile.next68k src/sys/arch/powerpc/conf: Makefile.powerpc src/sys/arch/riscv/conf: Makefile.riscv src/sys/arch/sh3/conf: Makefile.sh3 src/sys/arch/sparc/conf: Makefile.sparc src/sys/arch/sparc64/conf: Makefile.sparc64 src/sys/arch/sun2/conf: Makefile.sun2 src/sys/arch/sun3/conf: Makefile.sun3 src/sys/arch/usermode/conf: Makefile.usermode src/sys/arch/vax/conf: Makefile.vax src/sys/arch/x68k/conf: Makefile.x68k src/sys/arch/xen/conf: Makefile.xen src/sys/conf: Makefile.kern.inc src/sys/lib/libkern: Makefile.inc Log Message: - Determine KERN_AS automatically depending on whether OPT_MODULAR is set or not, in the same way as libcompat. - Specify OPT_MODULAR in the port Makefile instead of KERN_AS. Now, KERN_AS=library is used for kernels without module(7) for all ports. OK christos To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/conf/Makefile.aarch64 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/acorn32/conf/Makefile.acorn32 cvs rdiff -u -r1.84 -r1.85 src/sys/arch/alpha/conf/Makefile.alpha cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/Makefile.amd64 cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/Makefile.amiga cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/conf/Makefile.arm cvs rdiff -u -r1.77 -r1.78 src/sys/arch/atari/conf/Makefile.atari cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/conf/Makefile.cesfic cvs rdiff -u -r1.93 -r1.94 src/sys/arch/hp300/conf/Makefile.hp300 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/conf/Makefile.hpcarm cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/conf/Makefile.hppa cvs rdiff -u -r1.193 -r1.194 src/sys/arch/i386/conf/Makefile.i386 cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/conf/Makefile.ia64 cvs rdiff -u -r1.28 -r1.29 src/sys/arch/luna68k/conf/Makefile.luna68k cvs rdiff -u -r1.92 -r1.93 src/sys/arch/mac68k/conf/Makefile.mac68k cvs rdiff -u -r1.68 -r1.69 src/sys/arch/mips/conf/Makefile.mips cvs rdiff -u -r1.67 -r1.68 src/sys/arch/mvme68k/conf/Makefile.mvme68k cvs rdiff -u -r1.21 -r1.22 src/sys/arch/news68k/conf/Makefile.news68k cvs rdiff -u -r1.31 -r1.32 src/sys/arch/next68k/conf/Makefile.next68k cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/conf/Makefile.powerpc cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/Makefile.riscv cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sh3/conf/Makefile.sh3 cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/conf/Makefile.sparc cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sparc64/conf/Makefile.sparc64 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun2/conf/Makefile.sun2 cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sun3/conf/Makefile.sun3 cvs rdiff -u -r1.43 -r1.44 src/sys/arch/usermode/conf/Makefile.usermode cvs rdiff -u -r1.83 -r1.84 src/sys/arch/vax/conf/Makefile.vax cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x68k/conf/Makefile.x68k cvs rdiff -u -r1.46 -r1.47 src/sys/arch/xen/conf/Makefile.xen cvs rdiff -u -r1.265 -r1.266 src/sys/conf/Makefile.kern.inc cvs rdiff -u -r1.45 -r1.46 src/sys/lib/libkern/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/sys/arch/aarch64/conf/Makefile.aarch64 diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.11 src/sys/arch/aarch64/conf/Makefile.aarch64:1.12 --- src/sys/arch/aarch64/conf/Makefile.aarch64:1.11 Fri Sep 14 08:51:06 2018 +++ src/sys/arch/aarch64/conf/Makefile.aarch64 Sat Sep 22 12:24:01 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.aarch64,v 1.11 2018/09/14 08:51:06 skrll Exp $ +# $NetBSD: Makefile.aarch64,v 1.12 2018/09/22 12:24:01 rin Exp $ # Makefile for NetBSD # @@ -43,7 +43,7 @@ CFLAGS+= -mno-omit-leaf-frame-pointer ## ## (3) libkern and compat ## -KERN_AS= obj +OPT_MODULAR= %MODULAR% ## ## (4) local objects, compile rules, and dependencies Index: src/sys/arch/acorn32/conf/Makefile.acorn32 diff -u src/sys/arch/acorn32/conf/Makefile.acorn32:1.23
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Sat Sep 22 12:20:32 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: ata.c
Log Message:
revert atabus_alloc_drives() to use KM_NOSLEEP again - it's called with
ch_lock held hence cannot actually sleep, fixing is out of scope of the branch
To generate a diff of this commit:
cvs rdiff -u -r1.141.6.7 -r1.141.6.8 src/sys/dev/ata/ata.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.7 src/sys/dev/ata/ata.c:1.141.6.8
--- src/sys/dev/ata/ata.c:1.141.6.7 Sat Sep 22 09:26:48 2018
+++ src/sys/dev/ata/ata.c Sat Sep 22 12:20:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.8 2018/09/22 12:20:31 jdolecek Exp $");
#include "opt_ata.h"
@@ -719,7 +719,7 @@ atabus_alloc_drives(struct ata_channel *
atabus_free_drives(chp);
if (chp->ch_drive == NULL) {
chp->ch_drive = kmem_zalloc(
- sizeof(struct ata_drive_datas) * ndrives, KM_SLEEP);
+ sizeof(struct ata_drive_datas) * ndrives, KM_NOSLEEP);
}
if (chp->ch_drive == NULL) {
aprint_error_dev(chp->ch_atac->atac_dev,
CVS commit: src
Module Name:src Committed By: maxv Date: Sat Sep 22 12:19:11 UTC 2018 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL GENERIC_ISDN src/sys/conf: files src/sys/dev: DEVNAMES src/sys/dev/pci: files.pci Removed Files: src/share/man/man4: ifpci.4 src/sys/dev/pci: ifpci.c Log Message: Remove ifpci(4). It is part of ISDN, which we are retiring. To generate a diff of this commit: cvs rdiff -u -r1.1620 -r1.1621 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.668 -r1.669 src/share/man/man4/Makefile cvs rdiff -u -r1.6 -r0 src/share/man/man4/ifpci.4 cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.452 -r1.453 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/GENERIC_ISDN cvs rdiff -u -r1.1209 -r1.1210 src/sys/conf/files cvs rdiff -u -r1.314 -r1.315 src/sys/dev/DEVNAMES cvs rdiff -u -r1.403 -r1.404 src/sys/dev/pci/files.pci cvs rdiff -u -r1.32 -r0 src/sys/dev/pci/ifpci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1620 src/distrib/sets/lists/man/mi:1.1621 --- src/distrib/sets/lists/man/mi:1.1620 Fri Sep 21 18:38:25 2018 +++ src/distrib/sets/lists/man/mi Sat Sep 22 12:19:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1620 2018/09/21 18:38:25 maxv Exp $ +# $NetBSD: mi,v 1.1621 2018/09/22 12:19:11 maxv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1302,7 +1302,7 @@ ./usr/share/man/cat4/ieee1394if.0 man-sys-catman .cat ./usr/share/man/cat4/ieee80211.0 man-sys-catman .cat ./usr/share/man/cat4/ifmedia.0 man-sys-catman .cat -./usr/share/man/cat4/ifpci.0 man-sys-catman .cat +./usr/share/man/cat4/ifpci.0 man-obsolete obsolete ./usr/share/man/cat4/igmafb.0 man-sys-catman .cat ./usr/share/man/cat4/igphy.0 man-sys-catman .cat ./usr/share/man/cat4/igsfb.0 man-sys-catman .cat @@ -4422,7 +4422,7 @@ ./usr/share/man/html4/ieee1394if.html man-sys-htmlman html ./usr/share/man/html4/ieee80211.html man-sys-htmlman html ./usr/share/man/html4/ifmedia.html man-sys-htmlman html -./usr/share/man/html4/ifpci.html man-sys-htmlman html +./usr/share/man/html4/ifpci.html man-obsolete obsolete ./usr/share/man/html4/igmafb.html man-sys-htmlman html ./usr/share/man/html4/igphy.html man-sys-htmlman html ./usr/share/man/html4/igsfb.html man-sys-htmlman html @@ -7376,7 +7376,7 @@ ./usr/share/man/man4/ieee1394if.4 man-sys-man .man ./usr/share/man/man4/ieee80211.4 man-sys-man .man ./usr/share/man/man4/ifmedia.4 man-sys-man .man -./usr/share/man/man4/ifpci.4 man-sys-man .man +./usr/share/man/man4/ifpci.4 man-obsolete obsolete ./usr/share/man/man4/igmafb.4 man-sys-man .man ./usr/share/man/man4/igphy.4 man-sys-man .man ./usr/share/man/man4/igsfb.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.668 src/share/man/man4/Makefile:1.669 --- src/share/man/man4/Makefile:1.668 Fri Sep 21 18:38:25 2018 +++ src/share/man/man4/Makefile Sat Sep 22 12:19:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.668 2018/09/21 18:38:25 maxv Exp $ +# $NetBSD: Makefile,v 1.669 2018/09/22 12:19:11 maxv Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -146,7 +146,7 @@ MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6. # ISDN devices MAN+= isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \ - ifpci.4 isic.4 iwic.4 isdncapi.4 + isic.4 iwic.4 isdncapi.4 # onewire bus and devices MAN+= gpioow.4 onewire.4 owtemp.4 Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.102 src/sys/arch/amd64/conf/ALL:1.103 --- src/sys/arch/amd64/conf/ALL:1.102 Fri Sep 21 18:38:25 2018 +++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:19:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.102 2018/09/21 18:38:25 maxv Exp $ +# $NetBSD: ALL,v 1.103 2018/09/22 12:19:11 maxv Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.102 $" +#ident "ALL-$Revision: 1.103 $" maxusers 64 # estimated number of users @@ -1756,9 +1756,6 @@ isic* at pci? # Winbond W6692 iwic* at pci? -# AVM Fritz!PCI card -ifpci* at pci? - # AVM Fritz!PCI V2 card ifritz* at pci? Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.452 src/sys/arch/i386/conf/ALL:1.453 --- src/sys/arch/i386/conf/ALL:1.452 Fri Sep 21 18:38:25 2018 +++ src/sys/arch/i386/conf/ALL Sat Sep 22 12:19:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.452 2018/09/21 18:38:25 maxv Exp $ +# $NetBSD: ALL,v 1.453 2018/09/22 12:19:11
CVS commit: src/sys/arch
Module Name:src Committed By: rin Date: Sat Sep 22 12:05:52 UTC 2018 Modified Files: src/sys/arch/sun2/conf: Makefile.sun2 src/sys/arch/sun3/conf: Makefile.sun3 Log Message: No need to specify COMPAT_AS anymore. Now, it is automatically determined from OPT_MODULAR. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun2/conf/Makefile.sun2 cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sun3/conf/Makefile.sun3 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/sun2/conf/Makefile.sun2 diff -u src/sys/arch/sun2/conf/Makefile.sun2:1.22 src/sys/arch/sun2/conf/Makefile.sun2:1.23 --- src/sys/arch/sun2/conf/Makefile.sun2:1.22 Wed Mar 7 15:20:50 2018 +++ src/sys/arch/sun2/conf/Makefile.sun2 Sat Sep 22 12:05:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sun2,v 1.22 2018/03/07 15:20:50 maya Exp $ +# $NetBSD: Makefile.sun2,v 1.23 2018/09/22 12:05:52 rin Exp $ # Makefile for NetBSD # @@ -41,10 +41,8 @@ AFLAGS+= -x assembler-with-cpp OPT_MODULAR= %MODULAR% .if !empty(OPT_MODULAR) KERN_AS= obj -COMPAT_AS= obj .else KERN_AS= library -COMPAT_AS= library .endif # XXX lib/libkern/arch/m68k/Makefile.inc needs to know that # XXX our MACHINE_ARCH is m68000, and not m68k. --fredette Index: src/sys/arch/sun3/conf/Makefile.sun3 diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.107 src/sys/arch/sun3/conf/Makefile.sun3:1.108 --- src/sys/arch/sun3/conf/Makefile.sun3:1.107 Wed Mar 7 15:02:36 2018 +++ src/sys/arch/sun3/conf/Makefile.sun3 Sat Sep 22 12:05:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sun3,v 1.107 2018/03/07 15:02:36 maya Exp $ +# $NetBSD: Makefile.sun3,v 1.108 2018/09/22 12:05:52 rin Exp $ # Makefile for NetBSD # @@ -42,10 +42,8 @@ AFLAGS+= -x assembler-with-cpp OPT_MODULAR= %MODULAR% .if !empty(OPT_MODULAR) KERN_AS= obj -COMPAT_AS= obj .else KERN_AS= library -COMPAT_AS= library .endif ##
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Sep 22 11:58:19 UTC 2018
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Use fdt_open_into instead of fdt_move to load the DTB since we may make
changes to the tree after loading it. When we are done making changes,
call fdt_pack.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/fdt/fdt_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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.37 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.38
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.37 Sun Sep 16 11:24:29 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sat Sep 22 11:58:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.37 2018/09/16 11:24:29 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.38 2018/09/22 11:58:19 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.37 2018/09/16 11:24:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.38 2018/09/22 11:58:19 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -372,7 +372,7 @@ initarm(void *arg)
/* Load FDT */
int error = fdt_check_header(fdt_addr_r);
if (error == 0) {
- error = fdt_move(fdt_addr_r, fdt_data, sizeof(fdt_data));
+ error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data));
if (error != 0)
panic("fdt_move failed: %s", fdt_strerror(error));
fdtbus_set_data(fdt_data);
@@ -413,6 +413,11 @@ initarm(void *arg)
*/
fdt_update_stdout_path();
+ /*
+ * Done making changes to the FDT.
+ */
+ fdt_pack(fdt_data);
+
VPRINTF("consinit ");
consinit();
VPRINTF("ok\n");
CVS commit: [pgoyette-compat] src/sys/modules
Module Name:src
Committed By: pgoyette
Date: Sat Sep 22 11:43:24 UTC 2018
Modified Files:
src/sys/modules [pgoyette-compat]: Makefile
Log Message:
Don't build the "monolithic" compat_netbsd32 module, it is replaced by
the new version-specific modules.
To generate a diff of this commit:
cvs rdiff -u -r1.202.2.33 -r1.202.2.34 src/sys/modules/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/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.33 src/sys/modules/Makefile:1.202.2.34
--- src/sys/modules/Makefile:1.202.2.33 Wed Sep 12 21:46:08 2018
+++ src/sys/modules/Makefile Sat Sep 22 11:43:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.33 2018/09/12 21:46:08 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.34 2018/09/22 11:43:24 pgoyette Exp $
.include
@@ -264,7 +264,6 @@ SUBDIR+= wmimsi
.if ${MACHINE_CPU} == "arm" \
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
-SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
SUBDIR+= compat_netbsd32_20 compat_netbsd32_30
@@ -282,7 +281,6 @@ SUBDIR+= compat_netbsd32_sysvipc_50
.if ${MACHINE_ARCH} == "x86_64"
SUBDIR+= compat_linux32
-SUBDIR+= compat_netbsd32
SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
SUBDIR+= compat_netbsd32_20 compat_netbsd32_30
CVS commit: [pgoyette-compat] src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Sat Sep 22 11:41:35 UTC 2018 Modified Files: src/distrib/sets/lists/modules [pgoyette-compat]: ad.arm ad.mips md.amd64 Log Message: Mark the old compat_netbsd32 module as obsolete - it is replaced by the new version-specific modules To generate a diff of this commit: cvs rdiff -u -r1.10.12.5 -r1.10.12.6 src/distrib/sets/lists/modules/ad.arm \ src/distrib/sets/lists/modules/ad.mips cvs rdiff -u -r1.75.2.7 -r1.75.2.8 src/distrib/sets/lists/modules/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/ad.arm diff -u src/distrib/sets/lists/modules/ad.arm:1.10.12.5 src/distrib/sets/lists/modules/ad.arm:1.10.12.6 --- src/distrib/sets/lists/modules/ad.arm:1.10.12.5 Wed Sep 12 04:35:22 2018 +++ src/distrib/sets/lists/modules/ad.arm Sat Sep 22 11:41:35 2018 @@ -1,7 +1,7 @@ -# $NetBSD: ad.arm,v 1.10.12.5 2018/09/12 04:35:22 pgoyette Exp $ +# $NetBSD: ad.arm,v 1.10.12.6 2018/09/22 11:41:35 pgoyette Exp $ -./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod +./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete +./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete ./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod ./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod #./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod Index: src/distrib/sets/lists/modules/ad.mips diff -u src/distrib/sets/lists/modules/ad.mips:1.10.12.5 src/distrib/sets/lists/modules/ad.mips:1.10.12.6 --- src/distrib/sets/lists/modules/ad.mips:1.10.12.5 Wed Sep 12 04:35:22 2018 +++ src/distrib/sets/lists/modules/ad.mips Sat Sep 22 11:41:35 2018 @@ -1,32 +1,32 @@ -# $NetBSD: ad.mips,v 1.10.12.5 2018/09/12 04:35:22 pgoyette Exp $ -./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod,arch64,nocompatmodules -./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod -#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod -#./@MODULEDIR@/compat_netbsd32_10/compat_netbsd32_10.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_12 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_12/compat_netbsd32_12.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_13 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_13/compat_netbsd32_13.kmod base-kernel-modules kmod -#./@MODULEDIR@/compat_netbsd32_14 base-kernel-modules kmod -#./@MODULEDIR@/compat_netbsd32_14/compat_netbsd32_14.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_16 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_16/compat_netbsd32_16.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_20 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_20/compat_netbsd32_20.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_30 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_30/compat_netbsd32_30.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_40 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_40/compat_netbsd32_40.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_50 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_50/compat_netbsd32_50.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_60 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_60/compat_netbsd32_60.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_80 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_43 base-kernel-modules kmod -./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod base-kernel-modules kmod +# $NetBSD: ad.mips,v 1.10.12.6 2018/09/22 11:41:35 pgoyette Exp $ +./@MODULEDIR@/compat_netbsd32 base-obsolete obsolete +./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-obsolete obsolete +./@MODULEDIR@/compat_netbsd32_09 base-kernel-modules kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_09/compat_netbsd32_09.kmod base-kernel-modules kmod,arch64,nocompatmodules +#./@MODULEDIR@/compat_netbsd32_10 base-kernel-modules kmod,arch64,nocompatmodules +#./@MODULEDIR@/compat_netbsd32_10/compat_netbsd32_10.kmod base-kernel-modules kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_12 base-kernel-modules kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_12/compat_netbsd32_12.kmod base-kernel-modules kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_13 base-kernel-modules kmod,arch64,nocompatmodules +./@MODULEDIR@/compat_netbsd32_13/compat_netbsd32_13.kmod base-kernel-modules kmod,arch64,nocompatmodules
CVS commit: [pgoyette-compat] src/sys/opencrypto
Module Name:src
Committed By: pgoyette
Date: Sat Sep 22 10:49:09 UTC 2018
Modified Files:
src/sys/opencrypto [pgoyette-compat]: ocryptodev.c
Log Message:
Since the caller passes the address of our mutex, use it rather than
trying to reference it via global symbol (which might not exist).
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.4 -r1.11.2.5 src/sys/opencrypto/ocryptodev.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/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.4 src/sys/opencrypto/ocryptodev.c:1.11.2.5
--- src/sys/opencrypto/ocryptodev.c:1.11.2.4 Sat Sep 22 10:33:50 2018
+++ src/sys/opencrypto/ocryptodev.c Sat Sep 22 10:49:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.11.2.4 2018/09/22 10:33:50 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.11.2.5 2018/09/22 10:49:09 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.4 2018/09/22 10:33:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.5 2018/09/22 10:49:09 pgoyette Exp $");
#include
#include
@@ -162,10 +162,10 @@ mbail:
kmem_free(osnop, osgop->count * sizeof(struct osession_n_op));
break;
case OCIOCCRYPT:
- mutex_enter(_mtx);
+ mutex_enter(mtx);
ocop = (struct ocrypt_op *)data;
cse = (*real_csefind)(fcr, ocop->ses);
- mutex_exit(_mtx);
+ mutex_exit(mtx);
if (cse == NULL) {
DPRINTF("csefind failed\n");
return EINVAL;
CVS commit: [pgoyette-compat] src/sys/opencrypto
Module Name:src
Committed By: pgoyette
Date: Sat Sep 22 10:42:00 UTC 2018
Modified Files:
src/sys/opencrypto [pgoyette-compat]: ocryptodev.h
Log Message:
Forward-declare some structs so we can use pointers to them in
function declarations.
To generate a diff of this commit:
cvs rdiff -u -r1.3.16.2 -r1.3.16.3 src/sys/opencrypto/ocryptodev.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/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.3.16.2 src/sys/opencrypto/ocryptodev.h:1.3.16.3
--- src/sys/opencrypto/ocryptodev.h:1.3.16.2 Sat Sep 22 10:33:50 2018
+++ src/sys/opencrypto/ocryptodev.h Sat Sep 22 10:42:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.3.16.2 2018/09/22 10:33:50 pgoyette Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.3.16.3 2018/09/22 10:42:00 pgoyette Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -170,6 +170,12 @@ struct ocrypt_mop {
#define OCIOCCRYPT _IOWR('c', 103, struct ocrypt_op)
#define OCIOCNCRYPTM _IOWR('c', 107, struct ocrypt_mop)
+struct fcrypt;
+struct session_op;
+struct csession;
+struct crypt_op;
+struct crypt_n_op;
+
int ocryptof_ioctl(struct file *, u_long, void *, kmutex_t *,
int (*)(struct fcrypt *, struct session_op *),
int (*)(struct csession *, struct crypt_op *, struct lwp *),
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Sat Sep 22 10:33:51 UTC 2018 Modified Files: src/sys/opencrypto [pgoyette-compat]: cryptodev.c ocryptodev.c ocryptodev.h src/sys/sys [pgoyette-compat]: compat_stub.h Log Message: When the compat code needs to callback to the original code, we cannot call directly via the routines' global symbols, since the original code might not be built-in. So, the original code that calls compat code needs to pass in the addresses of the callbacks. This allows for the compat code to be built whether or not the original (calling) code is included. XXX Done for cryptodev, will need to do the same thing for ccd(4) and XXX vnd(4) To generate a diff of this commit: cvs rdiff -u -r1.98.2.4 -r1.98.2.5 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/sys/opencrypto/ocryptodev.c cvs rdiff -u -r1.3.16.1 -r1.3.16.2 src/sys/opencrypto/ocryptodev.h cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/sys/sys/compat_stub.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/opencrypto/cryptodev.c diff -u src/sys/opencrypto/cryptodev.c:1.98.2.4 src/sys/opencrypto/cryptodev.c:1.98.2.5 --- src/sys/opencrypto/cryptodev.c:1.98.2.4 Tue Sep 18 23:03:55 2018 +++ src/sys/opencrypto/cryptodev.c Sat Sep 22 10:33:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.c,v 1.98.2.4 2018/09/18 23:03:55 pgoyette Exp $ */ +/* $NetBSD: cryptodev.c,v 1.98.2.5 2018/09/22 10:33:50 pgoyette Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.4 2018/09/18 23:03:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.5 2018/09/22 10:33:50 pgoyette Exp $"); #include #include @@ -219,11 +219,24 @@ cryptof_write(file_t *fp, off_t *poff, return EIO; } -/* Hook the ocryptodev 50 compat code */ +/* + * Hook the ocryptodev 50 compat code + * + * This is a bit messy because we need to pass local stuff to the + * compat routines. The compat routines may be built-in to a + * kernel which doesn't contain the local stuff, so the compat + * code cannot directly reference them as globals. + */ MODULE_CALL_HOOK_DECL(ocryptof_50_hook, f, -(struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys()); +(struct file *fp, u_long cmd, void *data), +(fp, cmd, data, cryptodev_mtx, cryptodev_session, cryptodev_op, + cryptodev_mop, cryptodev_csefind), +enosys()); MODULE_CALL_HOOK(ocryptof_50_hook, f, -(struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys()); +(struct file *fp, u_long cmd, void *data), +(fp, cmd, data, _mtx, cryptodev_session, cryptodev_op, + cryptodev_mop, cryptodev_csefind), +enosys()); /* ARGSUSED */ int Index: src/sys/opencrypto/ocryptodev.c diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.3 src/sys/opencrypto/ocryptodev.c:1.11.2.4 --- src/sys/opencrypto/ocryptodev.c:1.11.2.3 Tue Sep 18 23:03:55 2018 +++ src/sys/opencrypto/ocryptodev.c Sat Sep 22 10:33:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ocryptodev.c,v 1.11.2.3 2018/09/18 23:03:55 pgoyette Exp $ */ +/* $NetBSD: ocryptodev.c,v 1.11.2.4 2018/09/22 10:33:50 pgoyette Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -69,7 +69,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.3 2018/09/18 23:03:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.4 2018/09/22 10:33:50 pgoyette Exp $"); #include #include @@ -101,14 +101,23 @@ __KERNEL_RCSID(0, "$NetBSD: ocryptodev.c #include static int ocryptodev_op(struct csession *, struct ocrypt_op *, - struct lwp *); + struct lwp *, int (*)(struct csession *, + struct crypt_op *, struct lwp *)); static int ocryptodev_mop(struct fcrypt *, struct ocrypt_n_op *, int, - struct lwp *); -static int ocryptodev_session(struct fcrypt *, struct osession_op *); -static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *, int); + struct lwp *, + int (*real_mop)(struct fcrypt *, struct crypt_n_op *, + int, struct lwp *)); +static int ocryptodev_session(struct fcrypt *, struct osession_op *, + int(*)(struct fcrypt *, struct session_op *)); +static int ocryptodev_msession(struct fcrypt *, struct osession_n_op *, + int, int (*)(struct fcrypt *, struct session_op *)); int -ocryptof_ioctl(struct file *fp, u_long cmd, void *data) +ocryptof_ioctl(struct file *fp, u_long cmd, void *data, kmutex_t *mtx, +int (*real_session)(struct fcrypt *, struct session_op *), +int (*real_op)(struct csession *, struct crypt_op *, struct lwp *), +int (*real_mop)(struct fcrypt *, struct crypt_n_op *, int,
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 22 10:30:53 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common Log Message: Missed this in previous files.* changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/sys/compat/common/files.common 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/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.36 src/sys/compat/common/files.common:1.1.2.37 --- src/sys/compat/common/files.common:1.1.2.36 Wed Sep 19 04:12:43 2018 +++ src/sys/compat/common/files.common Sat Sep 22 10:30:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.1.2.36 2018/09/19 04:12:43 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.37 2018/09/22 10:30:53 pgoyette Exp $ # # Generic files, used by all compat options. @@ -82,8 +82,8 @@ file compat/common/rtsock_50.c compat_5 file compat/common/vfs_syscalls_50.c compat_50 file compat/common/uipc_syscalls_50.c compat_50 file compat/common/vnd_50.c compat_50 -file compat/common/clockctl_50.c compat_50 & clockctl -file compat/common/if_spppsubr50.c compat_50 & sppp +file compat/common/clockctl_50.c compat_50 +file compat/common/if_spppsubr50.c compat_50 file compat/common/uvm_50.c compat_50 # Compatibility code for NetBSD 6.0 @@ -92,7 +92,7 @@ file compat/common/kern_sa_60.c compat_ file compat/common/tty_60.c compat_60 file compat/common/kern_time_60.c compat_60 file compat/common/kern_cpu_60.c compat_60 -file compat/common/ccd_60.c compat_60 & ccd +file compat/common/ccd_60.c compat_60 # Compatibility code for NetBSD 7.0 file compat/common/compat_70_mod.c compat_70
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Sat Sep 22 10:30:00 UTC 2018 Modified Files: src/sys/fs/puffs [pgoyette-compat]: files.puffs src/sys/opencrypto [pgoyette-compat]: files.opencrypto Log Message: Include the compat code whether or not the calling device or filesystem exists. To generate a diff of this commit: cvs rdiff -u -r1.6.18.1 -r1.6.18.2 src/sys/fs/puffs/files.puffs cvs rdiff -u -r1.26 -r1.26.8.1 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/fs/puffs/files.puffs diff -u src/sys/fs/puffs/files.puffs:1.6.18.1 src/sys/fs/puffs/files.puffs:1.6.18.2 --- src/sys/fs/puffs/files.puffs:1.6.18.1 Sat Mar 24 08:24:40 2018 +++ src/sys/fs/puffs/files.puffs Sat Sep 22 10:30:00 2018 @@ -1,9 +1,9 @@ -# $NetBSD: files.puffs,v 1.6.18.1 2018/03/24 08:24:40 pgoyette Exp $ +# $NetBSD: files.puffs,v 1.6.18.2 2018/09/22 10:30:00 pgoyette Exp $ deffs PUFFS define puffs: vfs -file fs/puffs/puffs_compat.c puffs & compat_50 +file fs/puffs/puffs_compat.c compat_50 file fs/puffs/puffs_msgif.c puffs file fs/puffs/puffs_node.c puffs file fs/puffs/puffs_subr.c puffs Index: src/sys/opencrypto/files.opencrypto diff -u src/sys/opencrypto/files.opencrypto:1.26 src/sys/opencrypto/files.opencrypto:1.26.8.1 --- src/sys/opencrypto/files.opencrypto:1.26 Wed May 24 10:05:09 2017 +++ src/sys/opencrypto/files.opencrypto Sat Sep 22 10:30:00 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.opencrypto,v 1.26 2017/05/24 10:05:09 knakahara Exp $ +# $NetBSD: files.opencrypto,v 1.26.8.1 2018/09/22 10:30:00 pgoyette Exp $ # # @@ -25,7 +25,7 @@ file opencrypto/gmac.c swcrypto # (and thus crypto hardware accelerators). defpseudo crypto: opencrypto file opencrypto/cryptodev.c crypto -file opencrypto/ocryptodev.c crypto & compat_50 +file opencrypto/ocryptodev.c compat_50 defflag opt_ocf.h CRYPTO_DEBUG CRYPTO_TIMING defparam opt_ocf.h CRYPTO_RET_Q_MAXLEN CRYPTO_RET_KQ_MAXLEN
CVS commit: [jdolecek-ncqfixes] src/sys/dev/ata
Module Name:src
Committed By: jdolecek
Date: Sat Sep 22 09:26:49 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq ata.c
Log Message:
use KM_SLEEP in atabus_alloc_drives() to avoid spurious failures; this is
not called from interrupt context
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.141.6.6 -r1.141.6.7 src/sys/dev/ata/ata.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4.2.4 src/sys/dev/ata/TODO.ncq:1.4.2.5
--- src/sys/dev/ata/TODO.ncq:1.4.2.4 Sat Sep 22 09:22:59 2018
+++ src/sys/dev/ata/TODO.ncq Sat Sep 22 09:26:48 2018
@@ -7,7 +7,6 @@ jdolecek-ncqfixes goals:
triggers KASSERT()
- fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY
ends up being handled as NOERROR, triggering KASSERT() in wd(4)
-- weed out remaining KM_NOSLEEP
Bugs
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.6 src/sys/dev/ata/ata.c:1.141.6.7
--- src/sys/dev/ata/ata.c:1.141.6.6 Sat Sep 22 09:22:59 2018
+++ src/sys/dev/ata/ata.c Sat Sep 22 09:26:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.6 2018/09/22 09:22:59 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.6 2018/09/22 09:22:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.7 2018/09/22 09:26:48 jdolecek Exp $");
#include "opt_ata.h"
@@ -719,7 +719,7 @@ atabus_alloc_drives(struct ata_channel *
atabus_free_drives(chp);
if (chp->ch_drive == NULL) {
chp->ch_drive = kmem_zalloc(
- sizeof(struct ata_drive_datas) * ndrives, KM_NOSLEEP);
+ sizeof(struct ata_drive_datas) * ndrives, KM_SLEEP);
}
if (chp->ch_drive == NULL) {
aprint_error_dev(chp->ch_atac->atac_dev,
CVS commit: [jdolecek-ncqfixes] src/sys/dev
Module Name:src
Committed By: jdolecek
Date: Sat Sep 22 09:23:00 UTC 2018
Modified Files:
src/sys/dev/ata [jdolecek-ncqfixes]: TODO.ncq ata.c ata_subr.c atavar.h
satapmp_subr.c wd.c wdvar.h
src/sys/dev/ic [jdolecek-ncqfixes]: ahcisata_core.c mvsata.c siisata.c
src/sys/dev/scsipi [jdolecek-ncqfixes]: atapi_wdc.c
src/sys/dev/usb [jdolecek-ncqfixes]: umass_isdata.c
Log Message:
separate ata_xfer slot allocation and the memory allocation, so that
there can be more queued xfers than number of supported slots by controller,
and use a pool instead of custom pre-allocation
primarily to help PR kern/52614
remove no longer needed custom wd(4) logic for flush cache
switch also wd(4) trim/suspend/setcache/wdioctlstrategy to sleep waiting
for the memory, they are all called from process context and this
avoids spurious failures
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.141.6.5 -r1.141.6.6 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/sys/dev/ata/ata_subr.c
cvs rdiff -u -r1.99.2.4 -r1.99.2.5 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/ata/satapmp_subr.c
cvs rdiff -u -r1.441.2.3 -r1.441.2.4 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.46.6.1 -r1.46.6.2 src/sys/dev/ata/wdvar.h
cvs rdiff -u -r1.62.2.4 -r1.62.2.5 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.41.2.3 -r1.41.2.4 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.35.6.4 -r1.35.6.5 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.129.6.3 -r1.129.6.4 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.36 -r1.36.6.1 src/sys/dev/usb/umass_isdata.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.4.2.3 src/sys/dev/ata/TODO.ncq:1.4.2.4
--- src/sys/dev/ata/TODO.ncq:1.4.2.3 Mon Sep 17 20:54:41 2018
+++ src/sys/dev/ata/TODO.ncq Sat Sep 22 09:22:59 2018
@@ -1,16 +1,13 @@
jdolecek-ncqfixes goals:
-- make ata_xfer dynamically allocated using a pool
- - will fix: queue is allocated regardless if there are any drives, fix?
- - malloc() -> kmem_zalloc() in ata_queue_alloc() once this is done
-- remove limit of queued ata_xfers, allow any number of pending xfers;
- this should fix kern/52614 AKA wdc-attached ATAPI cd(4)
-- remove the wd(4) flush condition, just allocate a dynamic ata_xfer
-- change wd(4) dump code to use on-stack ata_xfer to not rely on pool having
- memory
+- add to wd(4) a callout to restart buf queue processing when ata_get_xfer()
+ call fails and remove ata_channel_start()
+- change wd(4) dump code to use preallocated or on-stack ata_xfer to not rely
+ on pool having memory
- re-fix QEMU ahci(4) bug workaround (no READ LOG EXT support) - now it
triggers KASSERT()
- fix ahci(4) error handling under paralles - invalid bio via WD_CHAOS_MONKEY
ends up being handled as NOERROR, triggering KASSERT() in wd(4)
+- weed out remaining KM_NOSLEEP
Bugs
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.141.6.5 src/sys/dev/ata/ata.c:1.141.6.6
--- src/sys/dev/ata/ata.c:1.141.6.5 Mon Sep 17 20:54:41 2018
+++ src/sys/dev/ata/ata.c Sat Sep 22 09:22:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.141.6.5 2018/09/17 20:54:41 jdolecek Exp $ */
+/* $NetBSD: ata.c,v 1.141.6.6 2018/09/22 09:22:59 jdolecek Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.5 2018/09/17 20:54:41 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141.6.6 2018/09/22 09:22:59 jdolecek Exp $");
#include "opt_ata.h"
@@ -84,6 +84,7 @@ int atadebug_mask = ATADEBUG_MASK;
#endif
static ONCE_DECL(ata_init_ctrl);
+static struct pool ata_xfer_pool;
/*
* A queue of atabus instances, used to ensure the same bus probe order
@@ -142,6 +143,8 @@ static int
atabus_init(void)
{
+ pool_init(_xfer_pool, sizeof(struct ata_xfer), 0, 0, 0,
+ "ataspl", NULL, IPL_BIO);
TAILQ_INIT(_initq_head);
mutex_init(_qlock, MUTEX_DEFAULT, IPL_NONE);
cv_init(_qcv, "atainitq");
@@ -779,7 +782,7 @@ ata_get_params(struct ata_drive_datas *d
ATADEBUG_PRINT(("%s\n", __func__), DEBUG_FUNCS);
- xfer = ata_get_xfer(chp);
+ xfer = ata_get_xfer(chp, false);
if (xfer == NULL) {
ATADEBUG_PRINT(("%s: no xfer\n", __func__),
DEBUG_FUNCS|DEBUG_PROBE);
@@ -884,7 +887,7 @@ ata_set_mode(struct ata_drive_datas *drv
ATADEBUG_PRINT(("ata_set_mode=0x%x\n", mode), DEBUG_FUNCS);
- xfer = ata_get_xfer(chp);
+ xfer = ata_get_xfer(chp, false);
if (xfer == NULL) {
ATADEBUG_PRINT(("%s: no xfer\n", __func__),
DEBUG_FUNCS|DEBUG_PROBE);
@@ -919,7 +922,7 @@ int
ata_read_log_ext_ncq(struct ata_drive_datas *drvp, uint8_t flags,
uint8_t *slot, uint8_t *status, uint8_t *err)
{
- struct ata_xfer *xfer;
+ struct ata_xfer *xfer = >recovery_xfer;
int rv;
struct
