[User-mode-linux-devel] *Unofficial* patch from 10/30 cvs and test10-pre7

[William S. <wst...@po...>]

Good evening, all,
	This is an unofficial attempt to merge the cvs tree as of 2:30 EST
today with the test10-pre7 patch.
	Only one section didn't quite make sense; blk.h from cvs had a
"#define DEVICE_INTR do_ida" under compaq_smart2 that didn't seem to have
relevance for uml and wasn't even mentioned in 2.4.0-test1 through
2.4.0-test10-pre7.  Considering UML doesn't even do hardware, this
definitely falls in the who-gives-a-darn category.  :-)

[root@sparrow linux]# pwd
/usr/src/uml-linux/linux-2.4.0-test10-pre7.uml/include/linux
[root@sparrow linux]# diff -ud blk.h.uml blk.h | less
--- blk.h.uml   Tue Oct  3 20:09:20 2000
+++ blk.h       Mon Oct  2 14:02:34 2000
@@ -314,19 +314,9 @@
 #elif (MAJOR_NR == COMPAQ_SMART2_MAJOR)
 
 #define DEVICE_NAME "ida"
-#define DEVICE_INTR do_ida
 #define TIMEOUT_VALUE (25*HZ)
 #define DEVICE_REQUEST do_ida_request0
 #define DEVICE_NR(device) (MINOR(device) >> 4)
-
-#elif (MAJOR_NR == UBD_MAJOR)
-
-#define DEVICE_NAME "User-mode block device"
-#define DEVICE_INTR do_ubd
-#define DEVICE_REQUEST do_ubd_request
-#define DEVICE_NR(device) (MINOR(device))
-#define DEVICE_ON(device)
-#define DEVICE_OFF(device)
 
 #endif /* MAJOR_NR == whatever */
 
	Here's hoping this saves Jeff a little work on the official merge.
	Cheers,
	- Bill

---------------------------------------------------------------------------
	"Love is a snowmobile racing across the tundra and then suddenly it
flips over, pinning you underneath.  At night, the ice weasels come."
	-- Matt Groening
(Courtesy of Steve Dodd <di...@lo...>)
--------------------------------------------------------------------------
William Stearns (wst...@po...).  Mason, Buildkernel, named2hosts, 
and ipfwadm2ipchains are at:                http://www.pobox.com/~wstearns
LinuxMonth; articles for Linux Enthusiasts! http://www.linuxmonth.com
--------------------------------------------------------------------------