Module Name:    src
Committed By:   mlelstv
Date:           Sat Nov 21 11:26:55 UTC 2020

Modified Files:
        src/sys/dev/wscons: wsdisplay_vcons.c

Log Message:
Fix previous and tag the right callout...


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 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.41 src/sys/dev/wscons/wsdisplay_vcons.c:1.42
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.41	Sat Nov 21 11:23:22 2020
+++ src/sys/dev/wscons/wsdisplay_vcons.c	Sat Nov 21 11:26:55 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: wsdisplay_vcons.c,v 1.41 2020/11/21 11:23:22 mlelstv Exp $ */
+/*	$NetBSD: wsdisplay_vcons.c,v 1.42 2020/11/21 11:26:55 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.41 2020/11/21 11:23:22 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.42 2020/11/21 11:26:55 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, CALLOUT_MPSAFE);
+	callout_init(&vd->switch_callout, 0);
 	callout_setfunc(&vd->switch_callout, vcons_do_switch, vd);
 #ifdef VCONS_DRAW_INTR
 	vd->cells = 0;
@@ -176,7 +176,7 @@ vcons_init(struct vcons_data *vd, void *
 #ifdef VCONS_DRAW_INTR
 	vd->intr_softint = softint_establish(SOFTINT_SERIAL,
 	    vcons_softintr, vd);
-	callout_init(&vd->intr, 0);
+	callout_init(&vd->intr, CALLOUT_MPSAFE);
 	callout_setfunc(&vd->intr, vcons_intr, vd);
 	vd->intr_valid = 1;
 

Reply via email to