diff options
author | Robert Morris <[email protected]> | 2010-08-30 06:38:58 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2010-08-30 06:38:58 -0400 |
commit | 5ab868fd905c68a6fc934d2c2df514c9efae6598 (patch) | |
tree | a76007d702145da1ca219bd928f07c219548fd7c | |
parent | 789b508d538e6faf635e49f268a4f1f9e9b65f05 (diff) | |
download | xv6-labs-5ab868fd905c68a6fc934d2c2df514c9efae6598.tar.gz xv6-labs-5ab868fd905c68a6fc934d2c2df514c9efae6598.tar.bz2 xv6-labs-5ab868fd905c68a6fc934d2c2df514c9efae6598.zip |
set only PG and WP in vminit; the rest don't seem to be needed and are confusing
-rw-r--r-- | main.c | 2 | ||||
-rw-r--r-- | user.h | 1 | ||||
-rw-r--r-- | vm.c | 5 |
3 files changed, 5 insertions, 3 deletions
@@ -41,7 +41,7 @@ void mainc(void) { cprintf("\ncpu%d: starting xv6\n\n", cpu->id); - kvmalloc(); // initialze the kernel page table + kvmalloc(); // initialize the kernel page table pinit(); // process table tvinit(); // trap vectors binit(); // buffer cache @@ -21,6 +21,7 @@ int dup(int); int getpid(); char* sbrk(int); int sleep(int); +int uptime(); // ulib.c int stat(char*, struct stat*); @@ -375,8 +375,9 @@ vminit(void) lcr3(PADDR(kpgdir)); cr0 = rcr0(); - cr0 |= CR0_PE|CR0_PG|CR0_AM|CR0_WP|CR0_NE|CR0_TS|CR0_EM|CR0_MP; - cr0 &= ~(CR0_TS|CR0_EM); + // cr0 |= CR0_PE|CR0_PG|CR0_AM|CR0_WP|CR0_NE|CR0_TS|CR0_EM|CR0_MP; + // cr0 &= ~(CR0_TS|CR0_EM); + cr0 |= CR0_PG | CR0_WP; lcr0(cr0); } |