Changes in kernel/arch/ia32/src/smp/smp.c [63e27ef:b2fa1204] in mainline

File:

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

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

@@ -38 +38 @@
 #include <arch/smp/ap.h>
 #include <arch/boot/boot.h>
-#include <assert.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -46 +45 @@
 #include <func.h>
 #include <panic.h>
+#include <debug.h>
 #include <arch/asm.h>
 #include <mm/page.h>
@@ -53 +53 @@
 #include <mm/as.h>
 #include <log.h>
-#include <mem.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
@@ -102 +91 @@
         unsigned int i;
         
-        assert(ops != NULL);
-
-        /*
-         * SMP initialized, cpus array allocated. Assign each CPU its 
-         * physical APIC ID.
-         */
-        cpu_arch_id_init();
+        ASSERT(ops != NULL);
         
         /*
@@ -191 +174 @@
 int smp_irq_to_pin(unsigned int irq)
 {
-        assert(ops != NULL);
+        ASSERT(ops != NULL);
         return ops->irq_to_pin(irq);
 }