3 files changed, 11 insertions, 12 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 0edda616640f..332aac649966 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -485,7 +485,7 @@ config TREE_RCU_TRACE
 
 config RCU_BOOST
         bool "Enable RCU priority boosting"
-        depends on RT_MUTEXES && TINY_PREEMPT_RCU
+        depends on RT_MUTEXES && PREEMPT_RCU
         default n
         help
           This option boosts the priority of preempted RCU readers that
@@ -903,7 +903,6 @@ endif
 
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size"
-        default y
         help
           Enabling this option will pass "-Os" instead of "-O2" to gcc
           resulting in a smaller kernel.
@@ -924,14 +923,6 @@ menuconfig EXPERT
           environments which can tolerate a "non-standard" kernel.
           Only use this if you really know what you are doing.
 
-config EMBEDDED
-        bool "Embedded system"
-        select EXPERT
-        help
-          This option should be enabled if compiling the kernel for
-          an embedded system so certain expert options are available
-          for configuration.
-
 config UID16
         bool "Enable 16-bit UID system calls" if EXPERT
         depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -1098,6 +1089,14 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
+config EMBEDDED
+        bool "Embedded system"
+        select EXPERT
+        help
+          This option should be enabled if compiling the kernel for
+          an embedded system so certain expert options are available
+          for configuration.
+
 config HAVE_PERF_EVENTS
         bool
         help
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3e0112157795..c0851a8e030c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -186,7 +186,7 @@ dev_t name_to_dev_t(char *name)
                 goto done;
 
         /*
-         * try non-existant, but valid partition, which may only exist
+         * try non-existent, but valid partition, which may only exist
          * after revalidating the disk, like partitioned md devices
          */
         while (p > s && isdigit(p[-1]))
diff --git a/init/main.c b/init/main.c
index 4a9479ef4540..48df882d51d2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -580,8 +580,8 @@ asmlinkage void __init start_kernel(void)
 #endif
         page_cgroup_init();
         enable_debug_pagealloc();
-        kmemleak_init();
         debug_objects_mem_init();
+        kmemleak_init();
         setup_per_cpu_pageset();
         numa_policy_init();
         if (late_time_init)