Merge branch 'post-11' into post-12

phil-opp · phil-opp · commit 4101a0bd2e30 · 2022-04-08T10:07:31.000+02:00
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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ struct Selectors {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`pub fn init() {`
`44`		`- use x86_64::instructions::segmentation::set_cs;`
	`44`	`+ use x86_64::instructions::segmentation::{Segment, CS};`
`45`	`45`	`use x86_64::instructions::tables::load_tss;`
`46`	`46`
`47`	`47`	`GDT.0.load();`
`48`	`48`	`unsafe {`
`49`		`- set_cs(GDT.1.code_selector);`
	`49`	`+ CS::set_reg(GDT.1.code_selector);`
`50`	`50`	`load_tss(GDT.1.tss_selector);`
`51`	`51`	`}`
`52`	`52`	`}`