4 files changed, 83 insertions, 12 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 412c21b00d5..6aad581f18e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -673,7 +673,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
           be careful about enabling this. When memory resource controller
           is disabled by boot option, this will be automatically disabled and
           there will be no overhead from this. Even when you set this config=y,
-          if boot option "noswapaccount" is set, swap will not be accounted.
+          if boot option "swapaccount=0" is set, swap will not be accounted.
           Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
           size is 4096bytes, 512k per 1Gbytes of swap.
 config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
@@ -688,7 +688,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
           parameter should have this option unselected.
           For those who want to have the feature enabled by default should
           select this option (if, for some reason, they need to disable it
-          then noswapaccount does the trick).
+          then swapaccount=0 does the trick).
 
 config CGROUP_PERF
         bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
@@ -915,8 +915,16 @@ config SYSCTL
 config ANON_INODES
         bool
 
+config PANIC_TIMEOUT
+        int "Default panic timeout"
+        default 0
+        help
+          Set default panic timeout.
+
 menuconfig EXPERT
         bool "Configure standard kernel features (expert users)"
+        # Unhide debug options, to make the on-by-default options visible
+        select DEBUG_KERNEL
         help
           This option allows certain base kernel options and settings
           to be disabled or tweaked. This is for specialized
@@ -1007,14 +1015,19 @@ config ELF_CORE
         help
           Enable support for generating core dumps. Disabling saves about 4k.
 
+
 config PCSPKR_PLATFORM
         bool "Enable PC-Speaker support" if EXPERT
-        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+        depends on HAVE_PCSPKR_PLATFORM
+        select I8253_LOCK
         default y
         help
           This option allows to disable the internal PC-Speaker
           support, saving some memory.
 
+config HAVE_PCSPKR_PLATFORM
+        bool
+
 config BASE_FULL
         default y
         bool "Enable full-sized data structures for core" if EXPERT
@@ -1081,6 +1094,15 @@ config SHMEM
           option replaces shmem and tmpfs with the much simpler ramfs code,
           which may be appropriate on small systems without swap.
 
+config ASHMEM
+        bool "Enable the Anonymous Shared Memory Subsystem"
+        default n
+        depends on SHMEM || TINY_SHMEM
+        help
+          The ashmem subsystem is a new shared memory allocator, similar to
+          POSIX SHM but with different behavior and sporting a simpler
+          file-based API.
+
 config AIO
         bool "Enable AIO support" if EXPERT
         default y
diff --git a/init/calibrate.c b/init/calibrate.c
index aae2f40fea4..6816bf2fced 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/timex.h>
 #include <linux/smp.h>
+#include <linux/percpu.h>
 
 unsigned long lpj_fine;
 unsigned long preset_lpj;
@@ -243,12 +244,20 @@ recalibrate:
         return lpj;
 }
 
+static DEFINE_PER_CPU(unsigned long, cpu_loops_per_jiffy) = { 0 };
+
 void __cpuinit calibrate_delay(void)
 {
         unsigned long lpj;
         static bool printed;
+        int this_cpu = smp_processor_id();
 
-        if (preset_lpj) {
+        if (per_cpu(cpu_loops_per_jiffy, this_cpu)) {
+                lpj = per_cpu(cpu_loops_per_jiffy, this_cpu);
+                if (!printed)
+                        pr_info("Calibrating delay loop (skipped) "
+                                "already calibrated this CPU");
+        } else if (preset_lpj) {
                 lpj = preset_lpj;
                 if (!printed)
                         pr_info("Calibrating delay loop (skipped) "
@@ -266,6 +275,7 @@ void __cpuinit calibrate_delay(void)
                         pr_info("Calibrating delay loop... ");
                 lpj = calibrate_delay_converge();
         }
+        per_cpu(cpu_loops_per_jiffy, this_cpu) = lpj;
         if (!printed)
                 pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
                         lpj/(500000/HZ),
diff --git a/init/do_mounts.c b/init/do_mounts.c
index c0851a8e030..ef6478fbb54 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -360,15 +360,42 @@ out:
 }
  
 #ifdef CONFIG_ROOT_NFS
+
+#define NFSROOT_TIMEOUT_MIN     5
+#define NFSROOT_TIMEOUT_MAX     30
+#define NFSROOT_RETRY_MAX       5
+
 static int __init mount_nfs_root(void)
 {
         char *root_dev, *root_data;
+        unsigned int timeout;
+        int try, err;
 
-        if (nfs_root_data(&root_dev, &root_data) != 0)
-                return 0;
-        if (do_mount_root(root_dev, "nfs", root_mountflags, root_data) != 0)
+        err = nfs_root_data(&root_dev, &root_data);
+        if (err != 0)
                 return 0;
-        return 1;
+
+        /*
+         * The server or network may not be ready, so try several
+         * times.  Stop after a few tries in case the client wants
+         * to fall back to other boot methods.
+         */
+        timeout = NFSROOT_TIMEOUT_MIN;
+        for (try = 1; ; try++) {
+                err = do_mount_root(root_dev, "nfs",
+                                        root_mountflags, root_data);
+                if (err == 0)
+                        return 1;
+                if (try > NFSROOT_RETRY_MAX)
+                        break;
+
+                /* Wait, in case the server refused us immediately */
+                ssleep(timeout);
+                timeout <<= 1;
+                if (timeout > NFSROOT_TIMEOUT_MAX)
+                        timeout = NFSROOT_TIMEOUT_MAX;
+        }
+        return 0;
 }
 #endif
 
diff --git a/init/main.c b/init/main.c
index d7211faed2a..03b408dff82 100644
--- a/init/main.c
+++ b/init/main.c
@@ -209,8 +209,19 @@ early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
-        get_option(&str, &console_loglevel);
-        return 0;
+        int newlevel;
+
+        /*
+         * Only update loglevel value when a correct setting was passed,
+         * to prevent blind crashes (when loglevel being set to 0) that
+         * are quite hard to debug
+         */
+        if (get_option(&str, &newlevel)) {
+                console_loglevel = newlevel;
+                return 0;
+        }
+
+        return -EINVAL;
 }
 
 early_param("loglevel", loglevel);
@@ -369,9 +380,9 @@ static noinline void __init_refok rest_init(void)
         init_idle_bootup_task(current);
         preempt_enable_no_resched();
         schedule();
-        preempt_disable();
 
         /* Call into cpu_idle with preempt disabled */
+        preempt_disable();
         cpu_idle();
 }
 
@@ -715,10 +726,11 @@ static void __init do_basic_setup(void)
 {
         cpuset_init_smp();
         usermodehelper_init();
-        init_tmpfs();
+        shmem_init();
         driver_init();
         init_irq_proc();
         do_ctors();
+        usermodehelper_enable();
         do_initcalls();
 }