Merge branch 'post-10' into post-11

phil-opp · Apr 8, 2022 · 70714bc · 70714bc
2 parents 1893caa + f014994
commit 70714bc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/gdt.rs b/src/gdt.rs
@@ -41,12 +41,12 @@ struct Selectors {
 }
 
 pub fn init() {
-    use x86_64::instructions::segmentation::set_cs;
+    use x86_64::instructions::segmentation::{Segment, CS};
     use x86_64::instructions::tables::load_tss;
 
     GDT.0.load();
     unsafe {
-        set_cs(GDT.1.code_selector);
+        CS::set_reg(GDT.1.code_selector);
         load_tss(GDT.1.tss_selector);
     }
 }