[LV-commit] CVS: kernel-2.5/init do_mounts.c,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv14661/init

Modified Files:
	do_mounts.c 
Log Message:
Merge with 2.5.64


Index: do_mounts.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- do_mounts.c	4 Aug 2003 12:18:14 -0000	1.7
+++ do_mounts.c	23 Aug 2003 12:44:06 -0000	1.8
@@ -1,77 +1,28 @@
-#define __KERNEL_SYSCALLS__
-#include <linux/config.h>
-#include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
-#include <linux/unistd.h>
 #include <linux/ctype.h>
-#include <linux/blk.h>
 #include <linux/fd.h>
 #include <linux/tty.h>
[...1137 lines suppressed...]
-__setup("raid=", raid_setup);
-__setup("md=", md_setup);
-#endif
-
-static void __init md_run_setup(void)
-{
-#ifdef CONFIG_BLK_DEV_MD
-	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0), "md/0");
-	if (raid_setup_args.noautodetect)
-		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
-	else {
-		int fd = open("/dev/md0", 0, 0);
-		if (fd >= 0) {
-			sys_ioctl(fd, RAID_AUTORUN, 0);
-			close(fd);
-		}
-	}
-	md_setup_drive();
-#endif
-}