Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

2 files changed, 11 insertions, 1 deletions

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 4def882d0b31..a05cabd0fd10 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -86,7 +86,10 @@ static void __init handle_initrd(void)
                 printk("okay\n");
         else {
                 int fd = sys_open("/dev/root.old", O_RDWR, 0);
-                printk("failed\n");
+                if (error == -ENOENT)
+                        printk("/initrd does not exist. Ignored.\n");
+                else
+                        printk("failed\n");
                 printk(KERN_NOTICE "Unmounting old root\n");
                 sys_umount("/old", MNT_DETACH);
                 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
diff --git a/init/main.c b/init/main.c
index d324801729ba..b5e421e39ede 100644
--- a/init/main.c
+++ b/init/main.c
@@ -383,6 +383,13 @@ static void noinline rest_init(void)
         numa_default_policy();
         unlock_kernel();
         preempt_enable_no_resched();
+
+        /*
+         * The boot idle thread must execute schedule()
+         * at least one to get things moving:
+         */
+        schedule();
+
         cpu_idle();
 }