Module Name: src
Committed By: mlelstv
Date: Sat Nov 21 11:23:23 UTC 2020
Modified Files:
src/sys/dev/wscons: wsdisplay_vcons.c
Log Message:
Run callout without kernel lock, the softint itself is still protected.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/wscons/wsdisplay_vcons.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/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.40 src/sys/dev/wscons/wsdisplay_vcons.c:1.41
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.40 Wed Jul 31 14:29:54 2019
+++ src/sys/dev/wscons/wsdisplay_vcons.c Sat Nov 21 11:23:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.40 2019/07/31 14:29:54 rin Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.41 2020/11/21 11:23:22 mlelstv Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.40 2019/07/31 14:29:54 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.41 2020/11/21 11:23:22 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@ vcons_init(struct vcons_data *vd, void *
vd->wanted = NULL;
vd->currenttype = def;
vd->defaulttype = def;
- callout_init(&vd->switch_callout, 0);
+ callout_init(&vd->switch_callout, CALLOUT_MPSAFE);
callout_setfunc(&vd->switch_callout, vcons_do_switch, vd);
#ifdef VCONS_DRAW_INTR
vd->cells = 0;
