2 files changed, 17 insertions, 10 deletions

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index a05cabd0fd10..405f9031af87 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -56,6 +56,7 @@ static void __init handle_initrd(void)
         sys_chroot(".");
         mount_devfs_fs ();
 
+        current->flags |= PF_NOFREEZE;
         pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
         if (pid > 0) {
                 while (pid != sys_wait4(-1, NULL, 0, NULL))
diff --git a/init/main.c b/init/main.c
index 4c194c47395f..2714e0e7cfec 100644
--- a/init/main.c
+++ b/init/main.c
@@ -325,7 +325,7 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 #else
 
 #ifdef __GENERIC_PER_CPU
-unsigned long __per_cpu_offset[NR_CPUS];
+unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
 
 EXPORT_SYMBOL(__per_cpu_offset);
 
@@ -333,6 +333,7 @@ static void __init setup_per_cpu_areas(void)
 {
         unsigned long size, i;
         char *ptr;
+        unsigned long nr_possible_cpus = num_possible_cpus();
 
         /* Copy section for each CPU (we discard the original) */
         size = ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES);
@@ -340,12 +341,12 @@ static void __init setup_per_cpu_areas(void)
         if (size < PERCPU_ENOUGH_ROOM)
                 size = PERCPU_ENOUGH_ROOM;
 #endif
+        ptr = alloc_bootmem(size * nr_possible_cpus);
 
-        ptr = alloc_bootmem(size * NR_CPUS);
-
-        for (i = 0; i < NR_CPUS; i++, ptr += size) {
+        for_each_cpu(i) {
                 __per_cpu_offset[i] = ptr - __per_cpu_start;
                 memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
+                ptr += size;
         }
 }
 #endif /* !__GENERIC_PER_CPU */
@@ -438,6 +439,15 @@ void __init parse_early_param(void)
  *      Activate the first processor.
  */
 
+static void __init boot_cpu_init(void)
+{
+        int cpu = smp_processor_id();
+        /* Mark the boot cpu "present", "online" etc for SMP and UP case */
+        cpu_set(cpu, cpu_online_map);
+        cpu_set(cpu, cpu_present_map);
+        cpu_set(cpu, cpu_possible_map);
+}
+
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
@@ -447,17 +457,13 @@ asmlinkage void __init start_kernel(void)
  * enable them
  */
         lock_kernel();
+        boot_cpu_init();
         page_address_init();
         printk(KERN_NOTICE);
         printk(linux_banner);
         setup_arch(&command_line);
         setup_per_cpu_areas();
-
-        /*
-         * Mark the boot cpu "online" so that it can call console drivers in
-         * printk() and can access its per-cpu storage.
-         */
-        smp_prepare_boot_cpu();
+        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
         /*
          * Set up the scheduler prior starting any interrupts (such as the