patch-1.3.28 linux/init/main.c

• Lines: 37
• Date: Mon Sep 18 08:54:12 1995
• Orig file: v1.3.27/linux/init/main.c
• Orig date: Wed Sep 13 12:45:33 1995

diff -u --recursive --new-file v1.3.27/linux/init/main.c linux/init/main.c
@@ -62,6 +62,7 @@
 extern void aha1542_setup(char *str, int *ints);
 extern void aic7xxx_setup(char *str, int *ints);
 extern void buslogic_setup(char *str, int *ints);
+extern void fdomain_setup(char *str, int *ints);
 extern void scsi_luns_setup(char *str, int *ints);
 extern void sound_setup(char *str, int *ints);
 #ifdef CONFIG_CDU31A
@@ -205,6 +206,9 @@
 #ifdef CONFIG_SCSI_BUSLOGIC
 	{ "buslogic=", buslogic_setup},
 #endif
+#ifdef CONFIG_SCSI_FUTURE_DOMAIN
+	{ "fdomain=", fdomain_setup},
+#endif
 #ifdef CONFIG_BLK_DEV_XD
 	{ "xd=", xd_setup },
 #endif
@@ -359,14 +363,16 @@
 			int n;
 			line += 5;
 			if (strncmp(line,"/dev/",5)) {
-				ROOT_DEV = simple_strtoul(line,NULL,16);
+				ROOT_DEV = to_kdev_t(
+					     simple_strtoul(line,NULL,16));
 				continue;
 			}
 			line += 5;
 			for (n = 0 ; devnames[n] ; n++) {
 				int len = strlen(devnames[n]);
 				if (!strncmp(line,devnames[n],len)) {
-					ROOT_DEV = devnums[n]+simple_strtoul(line+len,NULL,0);
+					ROOT_DEV = to_kdev_t(devnums[n]+
+					     simple_strtoul(line+len,NULL,0));
 					break;
 				}
 			}