git: da69c6752674 - main - vt(4): Mark callouts MP-safe.

[Alexander Motin]

The branch main has been updated by mav:

URL: https://cgit.FreeBSD.org/src/commit/?id=da69c6752674e29eb5d8f82161ca7bc6d1866051

commit da69c6752674e29eb5d8f82161ca7bc6d1866051
Author:     Alexander Motin <mav at FreeBSD.org>
AuthorDate: 2021-09-03 19:42:46 +0000
Commit:     Alexander Motin <mav at FreeBSD.org>
CommitDate: 2021-09-03 19:42:46 +0000

    vt(4): Mark callouts MP-safe.
    
    The code explicitly takes Giant when it accesses keyboard, and I see
    no reason to take it globally by callout(9).
    
    MFC after:      1 month
---
 sys/dev/vt/vt_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index a8a1bfa2a8e5..2693c32d45be 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -2889,7 +2889,7 @@ vt_allocate_window(struct vt_device *vd, unsigned int window)
 
 	terminal_set_winsize(tm, &wsz);
 	vd->vd_windows[window] = vw;
-	callout_init(&vw->vw_proc_dead_timer, 0);
+	callout_init(&vw->vw_proc_dead_timer, 1);
 
 	return (vw);
 }
@@ -2913,7 +2913,7 @@ vt_upgrade(struct vt_device *vd)
 			vw = vt_allocate_window(vd, i);
 		}
 		if (!(vw->vw_flags & VWF_READY)) {
-			callout_init(&vw->vw_proc_dead_timer, 0);
+			callout_init(&vw->vw_proc_dead_timer, 1);
 			terminal_maketty(vw->vw_terminal, "v%r", VT_UNIT(vw));
 			vw->vw_flags |= VWF_READY;
 			if (vw->vw_flags & VWF_CONSOLE) {