From owner-cvs-src@FreeBSD.ORG Sun Feb 22 11:33:51 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0943616A4D0 for ; Sun, 22 Feb 2004 11:33:51 -0800 (PST) Received: from smtp.mho.com (smtp.mho.net [64.58.4.5]) by mx1.FreeBSD.org (Postfix) with SMTP id C1D1043D2F for ; Sun, 22 Feb 2004 11:33:50 -0800 (PST) (envelope-from scottl@freebsd.org) Received: (qmail 9846 invoked by uid 1002); 22 Feb 2004 19:33:50 -0000 Received: from unknown (HELO freebsd.org) (64.58.1.252) by smtp.mho.net with SMTP; 22 Feb 2004 19:33:50 -0000 Message-ID: <403903FE.3090306@freebsd.org> Date: Sun, 22 Feb 2004 12:33:18 -0700 From: Scott Long User-Agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.5) Gecko/20031007 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Mathew Kanner References: <200402212110.i1LLAtEX008732@repoman.freebsd.org> <20040221154636.U52892@pooker.samsco.home> <20040222010801.GC20226@cnd.mcgill.ca> <403800F0.9080504@freebsd.org> <20040222185750.GE20226@cnd.mcgill.ca> In-Reply-To: <20040222185750.GE20226@cnd.mcgill.ca> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: Poul-Henning Kamp cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/alpha/alpha mem.c promcons.csrc/sys/alpha/tlsbsrc/sys/cam/scsi scsi_ch.c scsi_pass.c scsi_pt.c s X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 19:33:51 -0000 Matt, I already committed the fix to ltmdm last night. One difference from your patch is that the D_TTY flag was added. For the nvidia patch, I'd also remove the definition for CDEV_MAJOR from nv_freebsd.h. Thanks for looking at these! Scott Mathew Kanner wrote: >>There is also ltmdm and nvidia, and both are affected by this. I can >>probably look at both tonight unless someone beats me to it. > > > Attached are patches for the ltmdm and nvidia ports. It > should suffice to drop them in the files subdir of the port. I've at > least tested the nvidia one since I have the hardware. They should be > also tested on a pre-cdev mega-patch kernel. > I should note that when nvidia module was rejected (wrong > version) on it panic'ed on kldunload with free wrong memtype. I'm > sorry for not capturing the details. > It's my hope that some with porting experience can get these > into the tree, pehaps with a friendly reminder to update you > out-of-tree modules in UPDATING. I'm not sure where source picks up > the freebsd-version so you may have to re-installed the sys header > files. > --Mat > > > > ------------------------------------------------------------------------ > > --- src/nvidia_ctl.c.old Sun Feb 22 13:05:46 2004 > +++ src/nvidia_ctl.c Sun Feb 22 13:07:25 2004 > @@ -43,7 +43,12 @@ > .d_ioctl = nvidia_ctl_ioctl, > .d_poll = nvidia_ctl_poll, > .d_name = "nvidiactl", > +#if __FreeBSD_version < 502103 > .d_maj = CDEV_MAJOR, > .d_flags = D_TRACKCLOSE > +#else > + .d_version = D_VERSION, > + .d_flags = D_NEEDGIANT > +#endif > #endif > }; > > > ------------------------------------------------------------------------ > > --- src/nvidia_dev.c.old Wed May 28 12:51:52 2003 > +++ src/nvidia_dev.c Sun Feb 22 13:36:25 2004 > @@ -45,7 +45,12 @@ > .d_poll = nvidia_dev_poll, > .d_mmap = nvidia_dev_mmap, > .d_name = "nvidia", > +#if __FreeBSD_version < 502103 > .d_maj = CDEV_MAJOR, > .d_flags = D_MEM|D_TRACKCLOSE > +#else > + .d_version = D_VERSION, > + .d_flags = D_MEM|D_TRACKCLOSE|D_NEEDGIANT > +#endif > #endif > }; > > > ------------------------------------------------------------------------ > > --- sys/dev/ltmdm/ltmdmsio.c.old Sun Feb 22 13:12:24 2004 > +++ sys/dev/ltmdm/ltmdmsio.c Sun Feb 22 13:13:38 2004 > @@ -407,11 +407,16 @@ > .d_ioctl = sioioctl, > .d_poll = ttypoll, > .d_name = driver_name, > +#if __FreeBSD_version < 502103 > #ifdef MAJOR_AUTO > .d_maj = MAJOR_AUTO, > #else > .d_maj = CDEV_MAJOR, > #endif > +#else > + .d_version = D_VERSION, > + .d_flags = D_NEEDGIANT, > +#endif > .d_kqfilter = ttykqfilter, > #endif > };