From cb953b8baa7296fbd66bc0ae0d341d2be7aa782a Mon Sep 17 00:00:00 2001 From: pgoyette Date: Sat, 5 Jun 2021 22:21:15 +0000 Subject: As with usbverbose and pciverbose, these modules are not safe to be auto-unloaded. Disable for now. All of these need to be updated with an appropriate refcount mechanism to ensure that the code and/or tables aren't unloaded while they are being used. --- sys/dev/mii/mii_verbose.c | 6 ++++-- sys/dev/scsipi/scsipi_verbose.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/mii/mii_verbose.c b/sys/dev/mii/mii_verbose.c index ad0dbd7f482..11062ac7690 100644 --- a/sys/dev/mii/mii_verbose.c +++ b/sys/dev/mii/mii_verbose.c @@ -1,4 +1,4 @@ -/* $NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $ */ +/* $NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $"); #include #include @@ -81,6 +81,8 @@ miiverbose_modcmd(modcmd_t cmd, void *arg) mii_get_descr = saved_mii_get_descr; mii_verbose_loaded = 0; return 0; + casce MODULE_CMD_AUTOUNLOAD: + return EBUSY; default: return ENOTTY; } diff --git a/sys/dev/scsipi/scsipi_verbose.c b/sys/dev/scsipi/scsipi_verbose.c index 594738fc18a..83f99dfeeba 100644 --- a/sys/dev/scsipi/scsipi_verbose.c +++ b/sys/dev/scsipi/scsipi_verbose.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $ */ +/* $NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $"); #include #include @@ -853,6 +853,8 @@ scsiverbose_modcmd(modcmd_t cmd, void *arg) scsipi_print_sense_data = saved_print_sense_data; scsi_verbose_loaded = 0; return 0; + case MODULE_CMD_AUTOUNLOAD: + return EBUSY; default: return ENOTTY; } -- cgit itle='2016-01-13 03:41:44 +0000'>2016-01-13diffutils has movedchristos 2003-01-26Import of diffutils-2.8.1 (converted with to-be-committedwiz 1999-02-12Use dist layout for diffutils, for easier upgrades and texinfo doc.tv