From 8c351e076843fbe408de88185f5af6035a92b28d Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sat, 18 Apr 2020 16:36:18 +0200
Subject: [PATCH] Use the I/O APIC when applicable.
---
src/arch/x86_64/device/ioapic.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/arch/x86_64/device/ioapic.rs b/src/arch/x86_64/device/ioapic.rs
index ecee0e8b..8c5c930e 100644
--- a/src/arch/x86_64/device/ioapic.rs
+++ b/src/arch/x86_64/device/ioapic.rs
@@ -306,12 +306,15 @@ pub unsafe fn init(active_table: &mut ActivePageTable) {
_ => (),
}
}
+<<<<<<< HEAD
/*
let namespace_guard = crate::acpi::ACPI_TABLE.namespace.read();
for (k, v) in namespace_guard.as_ref().unwrap().iter() {
println!("{} = {:?}", k, v);
}
*/
+=======
+>>>>>>> c723256... Use the I/O APIC when applicable.
}
println!("I/O APICs: {:?}, overrides: {:?}", ioapics(), src_overrides());
--
GitLab