From 10a6e148f001dddc6cf77a00fbc7a8735c85a506 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 21 Sep 2016 12:18:48 -0600
Subject: [PATCH] WIP: Userspace console
---
lib.rs | 2 +-
scheme/user.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib.rs b/lib.rs
index e9eec634..0bc1c0ef 100644
--- a/lib.rs
+++ b/lib.rs
@@ -162,7 +162,7 @@ pub extern fn kmain() {
unsafe {
interrupt::disable();
context::switch();
- interrupt::enable_and_halt();
+ interrupt::enable_and_nop();
}
}
}
diff --git a/scheme/user.rs b/scheme/user.rs
index 7604b0fd..ba8fd959 100644
--- a/scheme/user.rs
+++ b/scheme/user.rs
@@ -81,7 +81,7 @@ impl UserInner {
let full_size = ((offset + size + 4095)/4096) * 4096;
let mut to_address = arch::USER_GRANT_OFFSET;
- let mut flags = entry::PRESENT | entry::NO_EXECUTE;
+ let mut flags = entry::PRESENT | entry::NO_EXECUTE | entry::USER_ACCESSIBLE;
if writable {
flags |= entry::WRITABLE;
}
--
GitLab