1 files changed, 7 insertions, 8 deletions

diff --git a/init/main.c b/init/main.c
index 036f97c0c34c..e3f0bb20b4dd 100644
--- a/init/main.c
+++ b/init/main.c
@@ -94,7 +94,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void populate_rootfs(void);
 extern void driver_init(void);
 extern void prepare_namespace(void);
 #ifdef  CONFIG_ACPI
@@ -483,6 +482,12 @@ void __init __attribute__((weak)) smp_setup_processor_id(void)
 {
 }
 
+static const char linux_banner[] =
+        "Linux version " UTS_RELEASE
+        " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+        " (" LINUX_COMPILER ")"
+        " " UTS_VERSION "\n";
+
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
@@ -509,7 +514,7 @@ asmlinkage void __init start_kernel(void)
         boot_cpu_init();
         page_address_init();
         printk(KERN_NOTICE);
-        printk(linux_banner, UTS_RELEASE, UTS_VERSION);
+        printk(linux_banner);
         setup_arch(&command_line);
         unwind_setup();
         setup_per_cpu_areas();
@@ -739,12 +744,6 @@ static int init(void * unused)
 
         cpuset_init_smp();
 
-        /*
-         * Do this before initcalls, because some drivers want to access
-         * firmware files.
-         */
-        populate_rootfs();
-
         do_basic_setup();
 
         /*