diff options
author | Robert Morris <[email protected]> | 2016-08-11 15:41:53 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2016-08-11 15:41:53 -0400 |
commit | 9c65b32d9e8d84372e193ae2516b46d504d38263 (patch) | |
tree | 64f7f8d8e9b8e78b3fe722b78e00306beef76e73 | |
parent | c779cc2be1ad47461bd48f386d8f8a5b58a85f42 (diff) | |
download | xv6-labs-9c65b32d9e8d84372e193ae2516b46d504d38263.tar.gz xv6-labs-9c65b32d9e8d84372e193ae2516b46d504d38263.tar.bz2 xv6-labs-9c65b32d9e8d84372e193ae2516b46d504d38263.zip |
nothing much
-rw-r--r-- | initcode.S | 1 | ||||
-rw-r--r-- | proc.c | 2 | ||||
-rw-r--r-- | vm.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,5 @@ # Initial process execs /init. +# This code runs in user space. #include "syscall.h" #include "traps.h" @@ -283,7 +283,7 @@ scheduler(void) proc = p; switchuvm(p); p->state = RUNNING; - swtch(&cpu->scheduler, proc->context); + swtch(&cpu->scheduler, p->context); switchkvm(); // Process is done running for now. @@ -171,7 +171,7 @@ switchuvm(struct proc *p) ltr(SEG_TSS << 3); if(p->pgdir == 0) panic("switchuvm: no pgdir"); - lcr3(v2p(p->pgdir)); // switch to new address space + lcr3(v2p(p->pgdir)); // switch to process's address space popcli(); } |