Changes in kernel/arch/ia32/src/smp/smp.c [49e6c6b4:b2fa1204] in mainline

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (5 diffs)

kernel/arch/ia32/src/smp/smp.c

@@ -52 +52 @@
 #include <mm/slab.h>
 #include <mm/as.h>
-#include <print.h>
+#include <log.h>
 #include <memstr.h>
 #include <arch/drivers/i8259.h>
-#include <cpu.h>
 
 #ifdef CONFIG_SMP
@@ -81 +80 @@
 }
 
-static void cpu_arch_id_init(void)
-{
-        ASSERT(ops != NULL);
-        ASSERT(cpus != NULL);
-        
-        for (unsigned int i = 0; i < config.cpu_count; ++i) {
-                cpus[i].arch.id = ops->cpu_apic_id(i);
-        }
-}
-
 /*
  * Kernel thread for bringing up application processors. It becomes clear
@@ -103 +92 @@
         
         ASSERT(ops != NULL);
-
-        /*
-         * SMP initialized, cpus array allocated. Assign each CPU its 
-         * physical APIC ID.
-         */
-        cpu_arch_id_init();
         
         /*
@@ -146 +129 @@
                 
                 if (ops->cpu_apic_id(i) == bsp_l_apic) {
-                        printf("kmp: bad processor entry #%u, will not send IPI "
-                            "to myself\n", i);
+                        log(LF_ARCH, LVL_ERROR, "kmp: bad processor entry #%u, "
+                            "will not send IPI to myself", i);
                         continue;
                 }
@@ -179 +162 @@
                         if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
                             SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
-                                printf("%s: waiting for cpu%u (APIC ID = %d) "
-                                    "timed out\n", __FUNCTION__, i,
-                                    ops->cpu_apic_id(i));
+                                log(LF_ARCH, LVL_NOTE, "%s: waiting for cpu%u "
+                                    "(APIC ID = %d) timed out", __FUNCTION__,
+                                    i, ops->cpu_apic_id(i));
                         }
                 } else
-                        printf("INIT IPI for l_apic%d failed\n",
+                        log(LF_ARCH, LVL_ERROR, "INIT IPI for l_apic%d failed",
                             ops->cpu_apic_id(i));
         }