Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by ozaki-r in ti...
details: https://anonhg.NetBSD.org/src/rev/ca97d471689b
branches: netbsd-6
changeset: 776809:ca97d471689b
user: martin <martin%NetBSD.org@localhost>
date: Sun Dec 07 15:09:31 2014 +0000
description:
Pull up following revision(s) (requested by ozaki-r in ticket #1201):
sys/kern/kern_ktrace.c: revision 1.166
sys/dev/isa/aps.c: revision 1.16
sys/dev/sysmon/sysmonvar.h: revision 1.45
sys/dev/ir/irframe_tty.c: revision 1.60
sys/dev/sysmon/sysmon_envsys_events.c: revision 1.111-1.112 (patch)
sys/dev/pci/pccbb.c: revision 1.207
sys/dev/wscons/wskbd.c: revision 1.135
sys/dev/usb/ohci.c: revision 1.254
sys/net/if_ecosubr.c: revision 1.41
sys/dev/pcmcia/btbc.c: revision 1.17
sys/arch/x86/x86/via_padlock.c: revision 1.23
sys/dev/sdmmc/sdmmc.c: revision 1.23 (patch)
sys/dev/bluetooth/btkbd.c: revision 1.17
sys/dev/bluetooth/bcsp.c: revision 1.25
sys/arch/x86/pci/fwhrng.c: revision 1.8
sys/dev/ic/nslm7x.c: revision 1.61
share/man/man9/callout.9: revision 1.28 (patch)
Replace callout_stop with callout_halt and ensure the callout
is not running before destroying it.
diffstat:
share/man/man9/callout.9 | 11 +++++++++--
sys/arch/x86/pci/fwhrng.c | 6 +++---
sys/arch/x86/x86/via_padlock.c | 6 +++---
sys/dev/bluetooth/bcsp.c | 8 ++++----
sys/dev/bluetooth/btkbd.c | 7 +++----
sys/dev/ic/nslm7x.c | 6 +++---
sys/dev/ir/irframe_tty.c | 6 +++---
sys/dev/isa/aps.c | 6 +++---
sys/dev/pci/pccbb.c | 6 +++---
sys/dev/pcmcia/btbc.c | 6 +++---
sys/dev/sysmon/sysmon_envsys_events.c | 22 +++++++++++++---------
sys/dev/sysmon/sysmonvar.h | 3 +--
sys/dev/usb/ohci.c | 6 +++---
sys/dev/wscons/wskbd.c | 6 +++---
sys/kern/kern_ktrace.c | 9 +++++----
sys/net/if_ecosubr.c | 6 +++---
16 files changed, 65 insertions(+), 55 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r 3e92fd1baba1 -r ca97d471689b share/man/man9/callout.9
--- a/share/man/man9/callout.9 Sun Dec 07 13:57:58 2014 +0000
+++ b/share/man/man9/callout.9 Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: callout.9,v 1.25.10.1 2014/09/29 18:00:39 msaitoh Exp $
+.\" $NetBSD: callout.9,v 1.25.10.2 2014/12/07 15:09:32 martin Exp $
.\"
.\" Copyright (c) 2000, 2003, 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 3, 2009
+.Dd November 21, 2014
.Dt CALLOUT 9
.Os
.Sh NAME
@@ -114,6 +114,13 @@
.Fn callout_destroy
should always be called when the callout is no longer required (for instance,
when a device is being detached).
+The callout should be stopped before
+.Fn callout_destroy
+is called by calling
+.Fn callout_halt .
+Note that
+.Fn callout_stop
+shouldn't be used for this purpose.
.Pp
The
.Fn callout_reset
diff -r 3e92fd1baba1 -r ca97d471689b sys/arch/x86/pci/fwhrng.c
--- a/sys/arch/x86/pci/fwhrng.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/arch/x86/pci/fwhrng.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $ */
+/* $NetBSD: fwhrng.c,v 1.5.2.1 2014/12/07 15:09:32 martin Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.5 2012/02/02 19:43:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.5.2.1 2014/12/07 15:09:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,7 +214,7 @@
rnd_detach_source(&sc->sc_rnd_source);
- callout_stop(&sc->sc_rnd_ch);
+ callout_halt(&sc->sc_rnd_ch, NULL);
callout_destroy(&sc->sc_rnd_ch);
/* Disable the RNG. */
diff -r 3e92fd1baba1 -r ca97d471689b sys/arch/x86/x86/via_padlock.c
--- a/sys/arch/x86/x86/via_padlock.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/arch/x86/x86/via_padlock.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.21 2012/02/02 19:43:01 tls Exp $ */
+/* $NetBSD: via_padlock.c,v 1.21.2.1 2014/12/07 15:09:32 martin Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.21 2012/02/02 19:43:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.21.2.1 2014/12/07 15:09:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -627,7 +627,7 @@
struct via_padlock_softc *sc = device_private(self);
if (sc->sc_rnd_attached) {
- callout_stop(&sc->sc_rnd_co);
+ callout_halt(&sc->sc_rnd_co, NULL);
callout_destroy(&sc->sc_rnd_co);
rnd_detach_source(&sc->sc_rnd_source);
sc->sc_rnd_attached = false;
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/bluetooth/bcsp.c
--- a/sys/dev/bluetooth/bcsp.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/bluetooth/bcsp.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.20.8.1 2012/06/12 17:13:57 riz Exp $ */
+/* $NetBSD: bcsp.c,v 1.20.8.2 2014/12/07 15:09:32 martin Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.20.8.1 2012/06/12 17:13:57 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.20.8.2 2014/12/07 15:09:32 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -354,10 +354,10 @@
sc->sc_unit = NULL;
}
- callout_stop(&sc->sc_seq_timer);
+ callout_halt(&sc->sc_seq_timer, NULL);
callout_destroy(&sc->sc_seq_timer);
- callout_stop(&sc->sc_le_timer);
+ callout_halt(&sc->sc_le_timer, NULL);
callout_destroy(&sc->sc_le_timer);
return 0;
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/bluetooth/btkbd.c
--- a/sys/dev/bluetooth/btkbd.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/bluetooth/btkbd.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: btkbd.c,v 1.13.2.1 2012/04/03 17:31:19 riz Exp $ */
+/* $NetBSD: btkbd.c,v 1.13.2.2 2014/12/07 15:09:32 martin Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.13.2.1 2012/04/03 17:31:19 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.13.2.2 2014/12/07 15:09:32 martin Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -251,8 +251,7 @@
#ifdef WSDISPLAY_COMPAT_RAWKBD
#ifdef BTKBD_REPEAT
- callout_stop(&sc->sc_repeat);
- KASSERT(!callout_invoking(&sc->sc_repeat));
+ callout_halt(&sc->sc_repeat, NULL);
callout_destroy(&sc->sc_repeat);
#endif
#endif
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/ic/nslm7x.c
--- a/sys/dev/ic/nslm7x.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/ic/nslm7x.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $ */
+/* $NetBSD: nslm7x.c,v 1.59.2.1 2014/12/07 15:09:32 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.59 2012/01/21 15:50:13 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.59.2.1 2014/12/07 15:09:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1703,7 +1703,7 @@
void
lm_detach(struct lm_softc *lmsc)
{
- callout_stop(&lmsc->sc_callout);
+ callout_halt(&lmsc->sc_callout, NULL);
callout_destroy(&lmsc->sc_callout);
sysmon_envsys_unregister(lmsc->sc_sme);
}
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/ir/irframe_tty.c
--- a/sys/dev/ir/irframe_tty.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/ir/irframe_tty.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.58 2009/05/12 14:29:42 cegger Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.58.18.1 2014/12/07 15:09:31 martin Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.58 2009/05/12 14:29:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.58.18.1 2014/12/07 15:09:31 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -245,7 +245,7 @@
struct irframet_softc *sc = device_private(dev);
int rc;
- callout_stop(&sc->sc_timeout);
+ callout_halt(&sc->sc_timeout, NULL);
rc = irframe_detach(dev, flags);
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/isa/aps.c
--- a/sys/dev/isa/aps.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/isa/aps.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $ */
+/* $NetBSD: aps.c,v 1.14.10.1 2014/12/07 15:09:31 martin Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/* $OpenBSD: aps.c,v 1.17 2008/06/27 06:08:43 canacar Exp $ */
/*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.14 2011/02/16 10:08:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.14.10.1 2014/12/07 15:09:31 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -423,7 +423,7 @@
{
struct aps_softc *sc = device_private(self);
- callout_stop(&sc->sc_callout);
+ callout_halt(&sc->sc_callout, NULL);
callout_destroy(&sc->sc_callout);
if (sc->sc_sme)
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/pci/pccbb.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.204 2012/01/30 19:41:22 drochner Exp $ */
+/* $NetBSD: pccbb.c,v 1.204.2.1 2014/12/07 15:09:31 martin Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.204 2012/01/30 19:41:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.204.2.1 2014/12/07 15:09:31 martin Exp $");
/*
#define CBB_DEBUG
@@ -565,7 +565,7 @@
if (!TAILQ_EMPTY(&sc->sc_memwindow))
aprint_error_dev(self, "memory windows not empty");
- callout_stop(&sc->sc_insert_ch);
+ callout_halt(&sc->sc_insert_ch, NULL);
callout_destroy(&sc->sc_insert_ch);
mutex_destroy(&sc->sc_pwr_mtx);
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/pcmcia/btbc.c
--- a/sys/dev/pcmcia/btbc.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/pcmcia/btbc.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: btbc.c,v 1.15 2010/02/24 22:38:08 dyoung Exp $ */
+/* $NetBSD: btbc.c,v 1.15.16.1 2014/12/07 15:09:32 martin Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.15 2010/02/24 22:38:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.15.16.1 2014/12/07 15:09:32 martin Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -210,7 +210,7 @@
pmf_device_deregister(self);
btbc_disable(sc->sc_dev);
- callout_stop(&sc->sc_ledch);
+ callout_halt(&sc->sc_ledch, NULL);
callout_destroy(&sc->sc_ledch);
if (sc->sc_unit) {
diff -r 3e92fd1baba1 -r ca97d471689b sys/dev/sysmon/sysmon_envsys_events.c
--- a/sys/dev/sysmon/sysmon_envsys_events.c Sun Dec 07 13:57:58 2014 +0000
+++ b/sys/dev/sysmon/sysmon_envsys_events.c Sun Dec 07 15:09:31 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.98.8.3 2012/10/19 17:28:01 riz Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.98.8.4 2014/12/07 15:09:31 martin Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.98.8.3 2012/10/19 17:28:01 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.98.8.4 2014/12/07 15:09:31 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -550,7 +550,6 @@
Home |
Main Index |
Thread Index |
Old Index