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

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

@@ -38 +38 @@
 #include <arch/smp/mps.h>
 #include <arch/boot/boot.h>
+#include <assert.h>
 #include <mm/page.h>
 #include <time/delay.h>
@@ -46 +47 @@
 #include <arch.h>
 #include <ddi/irq.h>
-#include <ddi/device.h>
 
 #ifdef CONFIG_SMP
@@ -189 +189 @@
         irq_initialize(&l_apic_timer_irq);
         l_apic_timer_irq.preack = true;
-        l_apic_timer_irq.devno = device_assign_devno();
         l_apic_timer_irq.inr = IRQ_CLK;
         l_apic_timer_irq.claim = l_apic_timer_claim;
@@ -492 +491 @@
         
         /* Program Logical Destination Register. */
-        ASSERT(CPU->id < 8);
+        assert(CPU->id < 8);
         ldr_t ldr;