3 files changed, 25 insertions, 18 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 1d19fd25204b..05951c1d654e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -470,15 +470,6 @@ config MODULE_FORCE_UNLOAD
           rmmod).  This is mainly for kernel developers and desperate users.
           If unsure, say N.
 
-config OBSOLETE_MODPARM
-        bool
-        default y
-        depends on MODULES
-        help
-          You need this option to use module parameters on modules which
-          have not been converted to the new module parameter system yet.
-          If unsure, say Y.
-
 config MODVERSIONS
         bool "Module versioning support"
         depends on MODULES
diff --git a/init/initramfs.c b/init/initramfs.c
index 637344b05981..77b934cccefe 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -506,6 +506,7 @@ void __init populate_rootfs(void)
                 panic(err);
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start) {
+#ifdef CONFIG_BLK_DEV_RAM
                 int fd;
                 printk(KERN_INFO "checking if image is initramfs...");
                 err = unpack_to_rootfs((char *)initrd_start,
@@ -525,6 +526,15 @@ void __init populate_rootfs(void)
                         sys_close(fd);
                         free_initrd();
                 }
+#else
+                printk(KERN_INFO "Unpacking initramfs...");
+                err = unpack_to_rootfs((char *)initrd_start,
+                        initrd_end - initrd_start, 0);
+                if (err)
+                        panic(err);
+                printk(" done\n");
+                free_initrd();
+#endif
         }
 #endif
 }
diff --git a/init/main.c b/init/main.c
index 2714e0e7cfec..006dcd547dc2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -306,8 +306,6 @@ static int __init rdinit_setup(char *str)
 }
 __setup("rdinit=", rdinit_setup);
 
-extern void setup_arch(char **);
-
 #ifndef CONFIG_SMP
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -571,17 +569,23 @@ static void __init do_initcalls(void)
         int count = preempt_count();
 
         for (call = __initcall_start; call < __initcall_end; call++) {
-                char *msg;
+                char *msg = NULL;
+                char msgbuf[40];
+                int result;
 
                 if (initcall_debug) {
-                        printk(KERN_DEBUG "Calling initcall 0x%p", *call);
-                        print_fn_descriptor_symbol(": %s()", (unsigned long) *call);
+                        printk("Calling initcall 0x%p", *call);
+                        print_fn_descriptor_symbol(": %s()",
+                                        (unsigned long) *call);
                         printk("\n");
                 }
 
-                (*call)();
+                result = (*call)();
 
-                msg = NULL;
+                if (result && (result != -ENODEV || initcall_debug)) {
+                        sprintf(msgbuf, "error code %d", result);
+                        msg = msgbuf;
+                }
                 if (preempt_count() != count) {
                         msg = "preemption imbalance";
                         preempt_count() = count;
@@ -591,8 +595,10 @@ static void __init do_initcalls(void)
                         local_irq_enable();
                 }
                 if (msg) {
-                        printk(KERN_WARNING "error in initcall at 0x%p: "
-                                "returned with %s\n", *call, msg);
+                        printk(KERN_WARNING "initcall at 0x%p", *call);
+                        print_fn_descriptor_symbol(": %s()",
+                                        (unsigned long) *call);
+                        printk(": returned with %s\n", msg);
                 }
         }