Date: Mon, 4 Oct 2021 01:12:00 GMT From: Alexander Motin <mav@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 03d748e92447 - stable/13 - vt(4): Mark callouts MP-safe. Message-ID: <202110040112.1941C0KG007245@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=03d748e9244708b33c822b30422c0c3b5319640e commit 03d748e9244708b33c822b30422c0c3b5319640e Author: Alexander Motin <mav@FreeBSD.org> AuthorDate: 2021-09-03 19:42:46 +0000 Commit: Alexander Motin <mav@FreeBSD.org> CommitDate: 2021-10-04 01:11:59 +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 (cherry picked from commit da69c6752674e29eb5d8f82161ca7bc6d1866051) --- 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 e4a8288962c4..d4baa65f06c9 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -2890,7 +2890,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); } @@ -2914,7 +2914,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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110040112.1941C0KG007245>