WIP: Userspace console

2016-09-21 12:18:48 -06:00
parent ec240ef778
commit 10a6e148f0
2 changed files with 2 additions and 2 deletions
--- 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();
        }
    }
 }
--- 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;
            }