patch-1.3.91 linux/fs/devices.c

• Lines: 77
• Date: Wed Apr 17 09:01:19 1996
• Orig file: v1.3.90/linux/fs/devices.c
• Orig date: Tue Jan 9 12:26:53 1996

diff -u --recursive --new-file v1.3.90/linux/fs/devices.c linux/fs/devices.c
@@ -19,6 +19,13 @@
 #include <linux/errno.h>
 #ifdef CONFIG_KERNELD
 #include <linux/kerneld.h>
+
+#include <linux/tty.h>
+
+/* serial module kerneld load support */
+struct tty_driver *get_tty_driver(kdev_t device);
+#define isa_tty_dev(ma)	(ma == TTY_MAJOR || ma == TTYAUX_MAJOR)
+#define need_serial(ma,mi) (get_tty_driver(to_kdev_t(MKDEV(ma,mi))) == NULL)
 #endif
 
 struct device_struct {
@@ -53,17 +60,20 @@
 	}
 	return len;
 }
+
 /*
 	Return the function table of a device.
 	Load the driver if needed.
 */
 static struct file_operations * get_fops(
 	unsigned int major,
+	unsigned int minor,
 	unsigned int maxdev,
 	const char *mangle,		/* String to use to build the module name */
 	struct device_struct tb[])
 {
 	struct file_operations *ret = NULL;
+
 	if (major < maxdev){
 #ifdef CONFIG_KERNELD
 		/*
@@ -75,8 +85,14 @@
 		 * it locks the reboot process :-(
 		 *
 		 * Jacques Gelinas (jacques@solucorp.qc.ca)
+		 *
+		 * A. Haritsis <ah@doc.ic.ac.uk>: fix for serial module
+		 *  though we need the minor here to check if serial dev,
+		 *  we pass only the normal major char dev to kerneld 
+		 *  as there is no other loadable dev on these majors
 		 */
-		if (!tb[major].fops && major != 0) {
+		if ((isa_tty_dev(major) && need_serial(major,minor)) ||
+		    (major != 0 && !tb[major].fops)) {
 			char name[20];
 			sprintf(name, mangle, major);
 			request_module(name);
@@ -94,12 +110,12 @@
 */
 struct file_operations * get_blkfops(unsigned int major)
 {
-	return get_fops (major,MAX_BLKDEV,"block-major-%d",blkdevs);
+	return get_fops (major,0,MAX_BLKDEV,"block-major-%d",blkdevs);
 }
 
-struct file_operations * get_chrfops(unsigned int major)
+struct file_operations * get_chrfops(unsigned int major, unsigned int minor)
 {
-	return get_fops (major,MAX_CHRDEV,"char-major-%d",chrdevs);
+	return get_fops (major,minor,MAX_CHRDEV,"char-major-%d",chrdevs);
 }
 
 int register_chrdev(unsigned int major, const char * name, struct file_operations *fops)
@@ -271,7 +287,8 @@
 int chrdev_open(struct inode * inode, struct file * filp)
 {
 	int ret = -ENODEV;
-	filp->f_op = get_chrfops(MAJOR(inode->i_rdev));
+
+	filp->f_op = get_chrfops(MAJOR(inode->i_rdev), MINOR(inode->i_rdev));
 	if (filp->f_op != NULL){
 		ret = 0;
 		if (filp->f_op->open != NULL)