summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2010-07-25 20:30:21 -0400
committerFrans Kaashoek <[email protected]>2010-07-25 20:30:21 -0400
commit30f5bf054856805b69ef2c5a7485c8d2fecc7098 (patch)
tree70218604907a643731a27f5651394d826ea8ac54 /defs.h
parentaf03ab142de8c68ad56a829e39e8faee9db252d3 (diff)
downloadxv6-labs-30f5bf054856805b69ef2c5a7485c8d2fecc7098.tar.gz
xv6-labs-30f5bf054856805b69ef2c5a7485c8d2fecc7098.tar.bz2
xv6-labs-30f5bf054856805b69ef2c5a7485c8d2fecc7098.zip
some cleanup
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/defs.h b/defs.h
index d6d68ad..2bf5005 100644
--- a/defs.h
+++ b/defs.h
@@ -155,23 +155,22 @@ void uartputc(int);
// vm.c
#define PGROUNDUP(sz) ((sz+PGSIZE-1) & ~(PGSIZE-1))
+extern pde_t *kpgdir;
void pminit(void);
void ksegment(void);
void kvmalloc(void);
-void loadkvm(void);
void vminit(void);
void jkstack();
void printstack(void);
-void printpgdir(uint*);
-uint* setupkvm(void); // XXX need pde_t*
-char* uva2ka(uint*, char*);
-int allocuvm(uint*, char*, uint); // XXX need pde_t*
-void freevm(uint*);
-void inituvm(uint*, char*, char*, uint);
-int loaduvm(uint*, char*, struct inode *ip, uint, uint);
-uint* copyuvm(uint*,uint);
+void printpgdir(pde_t *);
+pde_t* setupkvm(void);
+char* uva2ka(pde_t*, char*);
+int allocuvm(pde_t*, char*, uint);
+void freevm(pde_t*);
+void inituvm(pde_t*, char*, char*, uint);
+int loaduvm(pde_t*, char*, struct inode *ip, uint, uint);
+pde_t* copyuvm(pde_t*,uint);
void loadvm(struct proc*);
// number of elements in fixed-size array
#define NELEM(x) (sizeof(x)/sizeof((x)[0]))
-