3 files changed, 13 insertions, 23 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 250e02c8f8f9..c11da38837e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE
           Enabling this option will pass "-Os" instead of "-O2" to gcc
           resulting in a smaller kernel.
 
-          If unsure, say N.
+          If unsure, say Y.
 
 config SYSCTL
         bool
@@ -558,17 +558,6 @@ config SYSCTL_SYSCALL
 
           If unsure say Y here.
 
-config SYSCTL_SYSCALL_CHECK
-        bool "Sysctl checks" if EMBEDDED
-        depends on SYSCTL_SYSCALL
-        default y
-        ---help---
-          sys_sysctl uses binary paths that have been found challenging
-          to properly maintain and use. This enables checks that help
-          you to keep things correct.
-
-          If unsure say Y here.
-
 config KALLSYMS
          bool "Load all symbols for debugging/ksymoops" if EMBEDDED
          default y
@@ -845,9 +834,10 @@ menuconfig MODULES
 
           If unsure, say Y.
 
+if MODULES
+
 config MODULE_FORCE_LOAD
         bool "Forced module loading"
-        depends on MODULES
         default n
         help
           Allow loading of modules without version information (ie. modprobe
@@ -856,7 +846,6 @@ config MODULE_FORCE_LOAD
 
 config MODULE_UNLOAD
         bool "Module unloading"
-        depends on MODULES
         help
           Without this option you will not be able to unload any
           modules (note that some modules may not be unloadable
@@ -875,7 +864,6 @@ config MODULE_FORCE_UNLOAD
 
 config MODVERSIONS
         bool "Module versioning support"
-        depends on MODULES
         help
           Usually, you have to use modules compiled with your kernel.
           Saying Y here makes it sometimes possible to use modules
@@ -886,7 +874,6 @@ config MODVERSIONS
 
 config MODULE_SRCVERSION_ALL
         bool "Source checksum for all modules"
-        depends on MODULES
         help
           Modules which contain a MODULE_VERSION get an extra "srcversion"
           field inserted into their modinfo section, which contains a
@@ -898,11 +885,12 @@ config MODULE_SRCVERSION_ALL
 
 config KMOD
         def_bool y
-        depends on MODULES
         help
           This is being removed soon.  These days, CONFIG_MODULES
           implies CONFIG_KMOD, so use that instead.
 
+endif # MODULES
+
 config STOP_MACHINE
         bool
         default y
diff --git a/init/calibrate.c b/init/calibrate.c
index 7963e3fc51d9..a379c9061199 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -170,7 +170,7 @@ void __cpuinit calibrate_delay(void)
                                 loops_per_jiffy &= ~loopbit;
                 }
         }
-        printk(KERN_INFO "%lu.%02lu BogoMIPS (lpj=%lu)\n",
+        printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n",
                         loops_per_jiffy/(500000/HZ),
                         (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
 }
diff --git a/init/main.c b/init/main.c
index 20fdc9884b77..f6f7042331dc 100644
--- a/init/main.c
+++ b/init/main.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/initrd.h>
-#include <linux/hdreg.h>
 #include <linux/bootmem.h>
 #include <linux/tty.h>
 #include <linux/gfp.h>
@@ -635,10 +634,11 @@ asmlinkage void __init start_kernel(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start && !initrd_below_start_ok &&
-            page_to_pfn(virt_to_page(initrd_start)) < min_low_pfn) {
+            page_to_pfn(virt_to_page((void *)initrd_start)) < min_low_pfn) {
                 printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - "
                     "disabling it.\n",
-                    page_to_pfn(virt_to_page(initrd_start)), min_low_pfn);
+                    page_to_pfn(virt_to_page((void *)initrd_start)),
+                    min_low_pfn);
                 initrd_start = 0;
         }
 #endif
@@ -691,7 +691,7 @@ asmlinkage void __init start_kernel(void)
         rest_init();
 }
 
-static int __initdata initcall_debug;
+static int initcall_debug;
 
 static int __init initcall_debug_setup(char *str)
 {
@@ -700,7 +700,7 @@ static int __init initcall_debug_setup(char *str)
 }
 __setup("initcall_debug", initcall_debug_setup);
 
-static void __init do_one_initcall(initcall_t fn)
+int do_one_initcall(initcall_t fn)
 {
         int count = preempt_count();
         ktime_t t0, t1, delta;
@@ -740,6 +740,8 @@ static void __init do_one_initcall(initcall_t fn)
                 print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn);
                 printk(" returned with %s\n", msgbuf);
         }
+
+        return result;
 }