Skip to content

Commit 96e0917

Browse files
committed
fix test
1 parent 597ff85 commit 96e0917

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

testing/src/gdt.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use lazy_static::lazy_static;
22
use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
33
use x86_64::structures::tss::TaskStateSegment;
4-
use x86_64::VirtAddr;
4+
use x86_64::{Singleton, VirtAddr};
55

66
pub const DOUBLE_FAULT_IST_INDEX: u16 = 0;
77

@@ -18,12 +18,12 @@ lazy_static! {
1818
};
1919
tss
2020
};
21-
static ref GDT: (GlobalDescriptorTable, Selectors) = {
21+
static ref GDT: (Singleton<GlobalDescriptorTable>, Selectors) = {
2222
let mut gdt = GlobalDescriptorTable::new();
2323
let code_selector = gdt.add_entry(Descriptor::kernel_code_segment());
2424
let tss_selector = gdt.add_entry(Descriptor::tss_segment(&TSS));
2525
(
26-
gdt,
26+
Singleton::new(gdt),
2727
Selectors {
2828
code_selector,
2929
tss_selector,
@@ -41,7 +41,7 @@ pub fn init() {
4141
use x86_64::instructions::segmentation::{CS, Segment};
4242
use x86_64::instructions::tables::load_tss;
4343

44-
GDT.0.load();
44+
GDT.0.try_get_mut().unwrap().load();
4545
unsafe {
4646
CS::set_reg(GDT.1.code_selector);
4747
load_tss(GDT.1.tss_selector);

0 commit comments

Comments
 (0)