From 02ca8edfc5a61bcac3ee6ee0517f67d42e0b0896 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sat, 18 Apr 2020 23:17:37 +0200
Subject: [PATCH] Execute AML code after IOAPIC init,
which tells the firmware that the I/O APIC is used rather than the 8259
PIC.
---
src/arch/x86_64/device/ioapic.rs | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/arch/x86_64/device/ioapic.rs b/src/arch/x86_64/device/ioapic.rs
index 8c5c930e..99f299e9 100644
--- a/src/arch/x86_64/device/ioapic.rs
+++ b/src/arch/x86_64/device/ioapic.rs
@@ -306,15 +306,6 @@ 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