Changeset 95c675b in mainline for kernel/arch/ia32/src/smp/smp.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 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>
@@ -45 +46 @@
 #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 <memstr.h>
+#include <mem.h>
 #include <arch/drivers/i8259.h>
 #include <cpu.h>
@@ -83 +83 @@
 static void cpu_arch_id_init(void)
 {
-        ASSERT(ops != NULL);
-        ASSERT(cpus != NULL);
+        assert(ops != NULL);
+        assert(cpus != NULL);
         
         for (unsigned int i = 0; i < config.cpu_count; ++i) {
@@ -102 +102 @@
         unsigned int i;
         
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
 
         /*
@@ -191 +191 @@
 int smp_irq_to_pin(unsigned int irq)
 {
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
         return ops->irq_to_pin(irq);
 }