From 7c1d5d830635d9b57e643024cc254e9e97d2614b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 14 Apr 2017 20:58:23 -0600
Subject: [PATCH] Disable SMP startup, fix issue with reusing trampoline frame
---
src/acpi/mod.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/acpi/mod.rs b/src/acpi/mod.rs
index 57b732c8..51f5bc1d 100644
--- a/src/acpi/mod.rs
+++ b/src/acpi/mod.rs
@@ -86,6 +86,7 @@ fn parse_sdt(sdt: &'static Sdt, active_table: &mut ActivePageTable) {
println!(" XAPIC {}: {:>08X}", me, local_apic.address);
}
+ /*
let trampoline_frame = Frame::containing_address(PhysicalAddress::new(TRAMPOLINE));
let trampoline_page = Page::containing_address(VirtualAddress::new(TRAMPOLINE));
@@ -174,8 +175,9 @@ fn parse_sdt(sdt: &'static Sdt, active_table: &mut ActivePageTable) {
}
// Unmap trampoline
- let result = active_table.unmap(trampoline_page);
+ let (result, _frame) = active_table.unmap_return(trampoline_page);
result.flush(active_table);
+ */
} else if let Some(dmar) = Dmar::new(sdt) {
println!(": {}: {}", dmar.addr_width, dmar.flags);
--
GitLab