From 5ab868fd905c68a6fc934d2c2df514c9efae6598 Mon Sep 17 00:00:00 2001
From: Robert Morris <rtm@nephron.lcs.mit.edu>
Date: Mon, 30 Aug 2010 06:38:58 -0400
Subject: [PATCH] set only PG and WP in vminit; the rest don't seem to be
needed and are confusing
---
main.c | 2 +-
user.h | 1 +
vm.c | 5 +++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/main.c b/main.c
index a6088cb..c8aa53a 100644
--- a/main.c
+++ b/main.c
@@ -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
diff --git a/user.h b/user.h
index 8280b2e..431428c 100644
--- a/user.h
+++ b/user.h
@@ -21,6 +21,7 @@ int dup(int);
int getpid();
char* sbrk(int);
int sleep(int);
+int uptime();
// ulib.c
int stat(char*, struct stat*);
diff --git a/vm.c b/vm.c
index 98ac108..ffdcab3 100644
--- a/vm.c
+++ b/vm.c
@@ -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);
}
--
GitLab