1 files changed, 31 insertions, 19 deletions

diff --git a/init/main.c b/init/main.c
index 4c194c47395f..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
@@ -325,7 +323,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 +331,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 +339,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 +437,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 +455,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
@@ -565,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;
@@ -585,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);
                 }
         }