From owner-cvs-all@FreeBSD.ORG Sun Feb 22 10:55:37 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3F0516A4EB; Sun, 22 Feb 2004 10:55:37 -0800 (PST) Received: from hak.cnd.mcgill.ca (hak.cnd.mcgill.ca [132.216.11.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 446F743D1D; Sun, 22 Feb 2004 10:55:37 -0800 (PST) (envelope-from mat@hak.cnd.mcgill.ca) Received: from hak.cnd.mcgill.ca (localhost [127.0.0.1]) by hak.cnd.mcgill.ca (8.12.9/8.12.8) with ESMTP id i1MIvoCR042639; Sun, 22 Feb 2004 13:57:50 -0500 (EST) (envelope-from mat@hak.cnd.mcgill.ca) Received: (from mat@localhost) by hak.cnd.mcgill.ca (8.12.9/8.12.8/Submit) id i1MIvoNh042638; Sun, 22 Feb 2004 13:57:50 -0500 (EST) Date: Sun, 22 Feb 2004 13:57:50 -0500 From: Mathew Kanner To: Scott Long Message-ID: <20040222185750.GE20226@cnd.mcgill.ca> References: <200402212110.i1LLAtEX008732@repoman.freebsd.org> <20040221154636.U52892@pooker.samsco.home> <20040222010801.GC20226@cnd.mcgill.ca> <403800F0.9080504@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline In-Reply-To: <403800F0.9080504@freebsd.org> User-Agent: Mutt/1.4.1i Organization: I speak for myself, operating in Montreal, CANADA X-Spam-Status: No, hits=1.0 required=5.0 tests=SUBJ_HAS_SPACES autolearn=no version=2.62 X-Spam-Checker-Version: SpamAssassin 2.62 (2004-01-11) on hak.cnd.mcgill.ca cc: cvs-all@FreeBSD.org cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: Poul-Henning Kamp cc: Mathew Kanner Subject: Re: cvs commit: src/sys/alpha/alpha mem.c promcons.c src/sys/alpha/tlsb zs_tlsb.c src/sys/amd64/amd64 mem.c src/sys/cam cam_xpt.c src/sys/cam/scsi scsi_ch.c scsi_pass.c scsi_pt.cs X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 18:55:38 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline > 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 -- Any idiot can face a crisis; it is this day-to-day living that wears you out. - Chekhov --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-src::nvidia_ctl.c" --- 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 }; --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-src::nvidia_dev.c" --- 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 }; --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-ltmdm.c" --- 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 }; --EVF5PPMfhYS0aIcm--