mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 10:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Interrupts: Make the MultiProcessorParser functional again

Browse source
This commit is contained in:
Liav A 2020-04-09 20:48:57 +03:00 • committed by Andreas Kling
parent a7c5a1fe69
commit fec8763c21
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Kernel/ACPI/MultiProcessorParser.cpp
View file

@ -40,7 +40,7 @@ bool MultiProcessorParser::is_initialized()
void MultiProcessorParser::initialize()
{
if (!MultiProcessorParser::is_initialized())
ASSERT(!is_initialized());
s_parser = new MultiProcessorParser;
}
@ -181,7 +181,7 @@ Vector<unsigned> MultiProcessorParser::get_pci_bus_ids()
MultiProcessorParser& MultiProcessorParser::the()
{
ASSERT(!MultiProcessorParser::is_initialized());
ASSERT(is_initialized());
return *s_parser;
}

3
Kernel/Interrupts/InterruptManagement.cpp
View file

@ -193,6 +193,7 @@ void InterruptManagement::switch_to_ioapic_mode()
APIC::init();
APIC::enable_bsp();
MultiProcessorParser::initialize();
locate_pci_interrupt_overrides();
}
void InterruptManagement::locate_apic_data()
@ -234,8 +235,6 @@ void InterruptManagement::locate_apic_data()
}
void InterruptManagement::locate_pci_interrupt_overrides()
{
// FIXME: calling the MultiProcessorParser causes a pagefault.
ASSERT_NOT_REACHED();
m_pci_interrupt_overrides = MultiProcessorParser::the().get_pci_interrupt_redirections();
}