From owner-svn-src-head@FreeBSD.ORG Wed Dec 11 23:05:06 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44F98BC4; Wed, 11 Dec 2013 23:05:06 +0000 (UTC) Received: from smtp.dlink.ua (smtp.dlink.ua [193.138.187.146]) by mx1.freebsd.org (Postfix) with ESMTP id EFE2011E4; Wed, 11 Dec 2013 23:05:05 +0000 (UTC) Received: from rnote.ddteam.net (144-60-135-95.pool.ukrtel.net [95.135.60.144]) (Authenticated sender: ray) by smtp.dlink.ua (Postfix) with ESMTPSA id 05DCCC4927; Thu, 12 Dec 2013 01:04:57 +0200 (EET) Date: Thu, 12 Dec 2013 01:04:43 +0200 From: Aleksandr Rybalko To: "George V. Neville-Neil" , John Baldwin Subject: Re: svn commit: r259221 - head/sys/dev/vt Message-Id: <20131212010443.2ab8e926.ray@freebsd.org> In-Reply-To: <201312111718.rBBHIAgM065186@svn.freebsd.org> References: <201312111718.rBBHIAgM065186@svn.freebsd.org> Organization: FreeBSD.ORG X-Mailer: Sylpheed 3.1.2 (GTK+ 2.24.5; amd64-portbld-freebsd9.0) X-Operating-System: FreeBSD Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 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: Wed, 11 Dec 2013 23:05:06 -0000 On Wed, 11 Dec 2013 17:18:10 +0000 (UTC) "George V. Neville-Neil" wrote: > Author: gnn > Date: Wed Dec 11 17:18:10 2013 > New Revision: 259221 > URL: http://svnweb.freebsd.org/changeset/base/259221 > > Log: > Fix a panic when booting with kernels that have FREEBBSD_COMPAT > 4, 5, 6 or 43 by only thunking the data parameter for old ioctls > compatability ioctls instead of doing it for all of them. > > Submitted by: jhb@ > > Modified: > head/sys/dev/vt/vt_core.c > > Modified: head/sys/dev/vt/vt_core.c > ============================================================================== > --- head/sys/dev/vt/vt_core.c Wed Dec 11 15:32:28 2013 > (r259220) +++ head/sys/dev/vt/vt_core.c Wed Dec 11 17:18:10 > 2013 (r259221) @@ -1321,9 +1321,12 @@ vtterm_ioctl(struct > terminal *tm, u_long case _IO('c', 110): > cmd = CONS_SETKBD; > break; > + default: > + goto skip_thunk; > } > ival = IOCPARM_IVAL(data); > data = (caddr_t)&ival; > +skip_thunk: > #endif > > switch (cmd) { Many thanks George and John! Next time I will just copy old code instead of try to optimize it :-D Thanks! WBW -- Aleksandr Rybalko