Use the I/O APIC when applicable.

2020-04-18 16:36:18 +02:00
parent 45fe040625
commit 8c351e0768
1 changed files with 3 additions and 0 deletions
--- 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());