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

[Mathew Kanner]

> 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
-------------- next part --------------
--- 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
 };
-------------- next part --------------
--- 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
 };
-------------- next part --------------
--- 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
 };