Module Name: src
Committed By: martin
Date: Wed May 12 10:25:23 UTC 2010
Modified Files:
src/sys/dev/ic: gem.c
Log Message:
Use callout_halt() instead of callout_stop() - otherwise gem_detach() might
be too fast and run callout_destroy() while another cpu is still busy
in the callout.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/ic/gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.94 src/sys/dev/ic/gem.c:1.95
--- src/sys/dev/ic/gem.c:1.94 Mon Apr 5 07:19:34 2010
+++ src/sys/dev/ic/gem.c Wed May 12 10:25:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.94 2010/04/05 07:19:34 joerg Exp $ */
+/* $NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.94 2010/04/05 07:19:34 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.95 2010/05/12 10:25:23 martin Exp $");
#include "opt_inet.h"
@@ -714,7 +714,7 @@
DPRINTF(sc, ("%s: gem_stop\n", device_xname(sc->sc_dev)));
- callout_stop(&sc->sc_tick_ch);
+ callout_halt(&sc->sc_tick_ch, NULL);
if ((sc->sc_flags & (GEM_SERDES | GEM_SERIAL)) != 0)
gem_pcs_stop(sc, disable);
else
