From owner-svn-src-head@FreeBSD.ORG Tue Nov 17 19:35:11 2009 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by hub.freebsd.org (Postfix) with ESMTP id CCBDE106568B; Tue, 17 Nov 2009 19:35:10 +0000 (UTC) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: src-committers@FreeBSD.org Date: Tue, 17 Nov 2009 14:34:54 -0500 User-Agent: KMail/1.6.2 References: <200911171924.nAHJOQIh032544@svn.freebsd.org> In-Reply-To: <200911171924.nAHJOQIh032544@svn.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_grvALVEc9GqwctC" Message-Id: <200911171434.56358.jkim@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Konstantin Belousov Subject: Re: svn commit: r199418 - head/sys/dev/syscons X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 19:35:11 -0000 --Boundary-00=_grvALVEc9GqwctC Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tuesday 17 November 2009 02:24 pm, Konstantin Belousov wrote: > Author: kib > Date: Tue Nov 17 19:24:26 2009 > New Revision: 199418 > URL: http://svn.freebsd.org/changeset/base/199418 > > Log: > Fix pgsignal() call after signature change in r199355. > > Reported and tested by: bf1783 googlemail com > MFC after: 1 month > > Modified: > head/sys/dev/syscons/scvidctl.c > > Modified: head/sys/dev/syscons/scvidctl.c > =================================================================== >=========== --- head/sys/dev/syscons/scvidctl.c Tue Nov 17 18:57:44 > 2009 (r199417) +++ head/sys/dev/syscons/scvidctl.c Tue Nov 17 > 19:24:26 2009 (r199418) @@ -321,6 +321,7 @@ > sc_set_pixel_mode(scr_stat *scp, struct return ENODEV; > #else > video_info_t info; > + ksiginfo_t ksi; > u_char *font; > int prev_ysize; > int error; > @@ -458,8 +459,11 @@ sc_set_pixel_mode(scr_stat *scp, struct > tp->t_winsize.ws_col = scp->xsize; > tp->t_winsize.ws_row = scp->ysize; > if (tp->t_pgrp != NULL) { > + ksiginfo_init(&ksi); > + ksi.ksi_signo = SIGWINCH; > + ksi.ksi_code = SI_KERNEL; > PGRP_LOCK(tp->t_pgrp); > - pgsignal(tp->t_pgrp, SIGWINCH, 1); > + pgsignal(tp->t_pgrp, SIGWINCH, 1, &ksi); > PGRP_UNLOCK(tp->t_pgrp); > } > } Probably you wanted this: --- sys/dev/syscons/scvidctl.c +++ sys/dev/syscons/scvidctl.c @@ -321,7 +321,6 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, i return ENODEV; #else video_info_t info; - ksiginfo_t ksi; u_char *font; int prev_ysize; int error; @@ -458,14 +457,8 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, i || tp->t_winsize.ws_row != scp->ysize) { tp->t_winsize.ws_col = scp->xsize; tp->t_winsize.ws_row = scp->ysize; - if (tp->t_pgrp != NULL) { - ksiginfo_init(&ksi); - ksi.ksi_signo = SIGWINCH; - ksi.ksi_code = SI_KERNEL; - PGRP_LOCK(tp->t_pgrp); - pgsignal(tp->t_pgrp, SIGWINCH, 1, &ksi); - PGRP_UNLOCK(tp->t_pgrp); - } + + tty_signal_pgrp(tp, SIGWINCH); } return 0; ------------------------------------------------------------------ In fact, it seems it was missed in r181905. Jung-uk Kim --Boundary-00=_grvALVEc9GqwctC Content-Type: text/x-diff; charset="iso-8859-1"; name="scvidctl.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="scvidctl.c.diff" --- sys/dev/syscons/scvidctl.c +++ sys/dev/syscons/scvidctl.c @@ -321,7 +321,6 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, i return ENODEV; #else video_info_t info; - ksiginfo_t ksi; u_char *font; int prev_ysize; int error; @@ -458,14 +457,8 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, i || tp->t_winsize.ws_row != scp->ysize) { tp->t_winsize.ws_col = scp->xsize; tp->t_winsize.ws_row = scp->ysize; - if (tp->t_pgrp != NULL) { - ksiginfo_init(&ksi); - ksi.ksi_signo = SIGWINCH; - ksi.ksi_code = SI_KERNEL; - PGRP_LOCK(tp->t_pgrp); - pgsignal(tp->t_pgrp, SIGWINCH, 1, &ksi); - PGRP_UNLOCK(tp->t_pgrp); - } + + tty_signal_pgrp(tp, SIGWINCH); } return 0; --Boundary-00=_grvALVEc9GqwctC--