patch-2.3.99-pre9 linux/init/main.c

• Lines: 29
• Date: Mon May 22 23:24:17 2000
• Orig file: v2.3.99-pre8/linux/init/main.c
• Orig date: Fri May 12 14:18:56 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/init/main.c linux/init/main.c
@@ -405,9 +405,18 @@
 	return 1;
 }
 
+static int __init quiet_kernel(char *str)
+{
+	if (*str)
+		return 0;
+	console_loglevel = 4;
+	return 1;
+}
+
 __setup("ro", readonly);
 __setup("rw", readwrite);
 __setup("debug", debug_kernel);
+__setup("quiet", quiet_kernel);
 
 /*
  * This is a simple kernel command line parsing function: it parses
@@ -726,8 +735,7 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	root_mountflags = real_root_mountflags;
-	if (mount_initrd && ROOT_DEV != real_root_dev
-	    && MAJOR(ROOT_DEV) == RAMDISK_MAJOR && MINOR(ROOT_DEV) == 0) {
+	if (mount_initrd && MAJOR(ROOT_DEV) == RAMDISK_MAJOR && MINOR(ROOT_DEV) == 0) {
 		int error;
 		int i, pid;