3 files changed, 51 insertions, 19 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 9a7656f0b5ec..4381006dd666 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -273,21 +273,24 @@ config UID16
           This enables the legacy 16-bit UID syscall wrappers.
 
 config SYSCTL
-        bool "Sysctl support" if EMBEDDED
-        default y
+        bool
+
+config SYSCTL_SYSCALL
+        bool "Sysctl syscall support"
+        default n
+        select SYSCTL
         ---help---
-          The sysctl interface provides a means of dynamically changing
-          certain kernel parameters and variables on the fly without requiring
-          a recompile of the kernel or reboot of the system.  The primary
-          interface consists of a system call, but if you say Y to "/proc
-          file system support", a tree of modifiable sysctl entries will be
-          generated beneath the /proc/sys directory. They are explained in the
-          files in <file:Documentation/sysctl/>.  Note that enabling this
-          option will enlarge the kernel by at least 8 KB.
-
-          As it is generally a good thing, you should say Y here unless
-          building a kernel for install/rescue disks or your system is very
-          limited in memory.
+          Enable the deprecated sysctl system call.  sys_sysctl uses
+          binary paths that have been found to be a major pain to maintain
+          and use.  The interface in /proc/sys is now the primary and what
+          everyone uses.
+
+          Nothing has been using the binary sysctl interface for some time
+          time now so nothing should break if you disable sysctl syscall
+          support, and you kernel will get marginally smaller.
+
+          Unless you have an application that uses the sys_syscall interface
+          you should probably say N here.
 
 config KALLSYMS
          bool "Load all symbols for debugging/kksymoops" if EMBEDDED
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 94aeec7aa917..b290aadb1d3f 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -8,6 +8,7 @@
 #include <linux/security.h>
 #include <linux/delay.h>
 #include <linux/mount.h>
+#include <linux/device.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>
@@ -403,6 +404,10 @@ void __init prepare_namespace(void)
                 ssleep(root_delay);
         }
 
+        /* wait for the known devices to complete their probing */
+        while (driver_probe_done() != 0)
+                msleep(100);
+
         md_run_setup();
 
         if (saved_root_name[0]) {
diff --git a/init/main.c b/init/main.c
index 8651a720a092..0766e69712b2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -128,6 +128,18 @@ static char *ramdisk_execute_command;
 static unsigned int max_cpus = NR_CPUS;
 
 /*
+ * If set, this is an indication to the drivers that reset the underlying
+ * device before going ahead with the initialization otherwise driver might
+ * rely on the BIOS and skip the reset operation.
+ *
+ * This is useful if kernel is booting in an unreliable environment.
+ * For ex. kdump situaiton where previous kernel has crashed, BIOS has been
+ * skipped and devices will be in unknown state.
+ */
+unsigned int reset_devices;
+EXPORT_SYMBOL(reset_devices);
+
+/*
  * Setup routine for controlling SMP activation
  *
  * Command-line option of "nosmp" or "maxcpus=0" will disable SMP
@@ -153,6 +165,14 @@ static int __init maxcpus(char *str)
 
 __setup("maxcpus=", maxcpus);
 
+static int __init set_reset_devices(char *str)
+{
+        reset_devices = 1;
+        return 1;
+}
+
+__setup("reset_devices", set_reset_devices);
+
 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
 static const char *panic_later, *panic_param;
@@ -162,16 +182,19 @@ extern struct obs_kernel_param __setup_start[], __setup_end[];
 static int __init obsolete_checksetup(char *line)
 {
         struct obs_kernel_param *p;
+        int had_early_param = 0;
 
         p = __setup_start;
         do {
                 int n = strlen(p->str);
                 if (!strncmp(line, p->str, n)) {
                         if (p->early) {
-                                /* Already done in parse_early_param?  (Needs
-                                 * exact match on param part) */
+                                /* Already done in parse_early_param?
+                                 * (Needs exact match on param part).
+                                 * Keep iterating, as we can have early
+                                 * params and __setups of same names 8( */
                                 if (line[n] == '\0' || line[n] == '=')
-                                        return 1;
+                                        had_early_param = 1;
                         } else if (!p->setup_func) {
                                 printk(KERN_WARNING "Parameter %s is obsolete,"
                                        " ignored\n", p->str);
@@ -181,7 +204,8 @@ static int __init obsolete_checksetup(char *line)
                 }
                 p++;
         } while (p < __setup_end);
-        return 0;
+
+        return had_early_param;
 }
 
 /*
@@ -464,6 +488,7 @@ asmlinkage void __init start_kernel(void)
          * Need to run as early as possible, to initialize the
          * lockdep hash:
          */
+        unwind_init();
         lockdep_init();
 
         local_irq_disable();
@@ -502,7 +527,6 @@ asmlinkage void __init start_kernel(void)
                    __stop___param - __start___param,
                    &unknown_bootoption);
         sort_main_extable();
-        unwind_init();
         trap_init();
         rcu_init();
         init_IRQ();