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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

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

@@ -55 +55 @@
 #include <log.h>
 #include <mem.h>
-#include <arch/drivers/i8259.h>
+#include <genarch/drivers/i8259/i8259.h>
 #include <cpu.h>
 
@@ -130 +130 @@
         pio_write_8((ioport8_t *) 0x71, 0xa);
 
-        pic_disable_irqs(0xffff);
+        i8259_disable_irqs(0xffff);
         apic_init();