Changeset 95c675b in mainline for kernel/arch/ia32/src/smp/mps.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/mps.c (modified) (4 diffs)

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

@@ -37 +37 @@
 #include <config.h>
 #include <log.h>
-#include <debug.h>
 #include <arch/smp/mps.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>
+#include <assert.h>
 #include <func.h>
 #include <typedefs.h>
@@ -74 +74 @@
 static uint8_t mps_cpu_apic_id(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         return processor_entries[i].l_apic_id;
@@ -81 +81 @@
 static bool mps_cpu_enabled(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         /*
@@ -96 +96 @@
 static bool mps_cpu_bootstrap(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         return (bool) ((processor_entries[i].cpu_flags & 0x02) == 0x02);