2 files changed, 1 insertions, 20 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 77b934cccefe..679d870d991b 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -519,7 +519,7 @@ void __init populate_rootfs(void)
                         return;
                 }
                 printk("it isn't (%s); looks like an initrd\n", err);
-                fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 700);
+                fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
                 if (fd >= 0) {
                         sys_write(fd, (char *)initrd_start,
                                         initrd_end - initrd_start);
diff --git a/init/main.c b/init/main.c
index 006dcd547dc2..64466ea1984c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -645,24 +645,6 @@ static void run_init_process(char *init_filename)
         execve(init_filename, argv_init, envp_init);
 }
 
-static inline void fixup_cpu_present_map(void)
-{
-#ifdef CONFIG_SMP
-        int i;
-
-        /*
-         * If arch is not hotplug ready and did not populate
-         * cpu_present_map, just make cpu_present_map same as cpu_possible_map
-         * for other cpu bringup code to function as normal. e.g smp_init() etc.
-         */
-        if (cpus_empty(cpu_present_map)) {
-                for_each_cpu(i) {
-                        cpu_set(i, cpu_present_map);
-                }
-        }
-#endif
-}
-
 static int init(void * unused)
 {
         lock_kernel();
@@ -684,7 +666,6 @@ static int init(void * unused)
 
         do_pre_smp_initcalls();
 
-        fixup_cpu_present_map();
         smp_init();
         sched_init_smp();