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

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (1 diff)

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

@@ -130 +130 @@
         pio_write_8((ioport8_t *) 0x71, 0xa);
 
-        pic_disable_irqs(0xffff);
+        i8259_disable_irqs(0xffff);
         apic_init();