From 701c31cee09a71be0cf77f7e8c1720385d8d2405 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Mon, 13 Jul 2020 15:49:37 +0200
Subject: [PATCH] Fix PTI compilation
It's broken on master anyway
---
src/arch/x86_64/gdt.rs | 2 +-
src/arch/x86_64/pti.rs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/arch/x86_64/gdt.rs b/src/arch/x86_64/gdt.rs
index f5c950c..c171314 100644
--- a/src/arch/x86_64/gdt.rs
+++ b/src/arch/x86_64/gdt.rs
@@ -99,7 +99,7 @@ pub unsafe fn set_tcb(pid: usize) {
#[cfg(feature = "pti")]
pub unsafe fn set_tss_stack(stack: usize) {
- use arch::x86_64::pti::{PTI_CPU_STACK, PTI_CONTEXT_STACK};
+ use super::pti::{PTI_CPU_STACK, PTI_CONTEXT_STACK};
TSS.rsp[0] = (PTI_CPU_STACK.as_ptr() as usize + PTI_CPU_STACK.len()) as u64;
PTI_CONTEXT_STACK = stack;
}
diff --git a/src/arch/x86_64/pti.rs b/src/arch/x86_64/pti.rs
index 3363715..8312521 100644
--- a/src/arch/x86_64/pti.rs
+++ b/src/arch/x86_64/pti.rs
@@ -2,11 +2,11 @@
use core::ptr;
#[cfg(feature = "pti")]
-use memory::Frame;
+use crate::memory::Frame;
#[cfg(feature = "pti")]
-use paging::ActivePageTable;
+use crate::paging::ActivePageTable;
#[cfg(feature = "pti")]
-use paging::entry::EntryFlags;
+use crate::paging::entry::EntryFlags;
#[cfg(feature = "pti")]
#[thread_local]
--
GitLab