summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2010-09-02 18:28:36 -0400
committerAustin Clements <[email protected]>2010-09-02 18:28:36 -0400
commit79cd8b3eedeb1f85d3b19fb6119bd5224c4c532a (patch)
treef9afe121e2b9298b35d3ccd61a329f03421c97fa /defs.h
parentd49d31381df93b40c1c4bc18c97ca42c3256e414 (diff)
downloadxv6-labs-79cd8b3eedeb1f85d3b19fb6119bd5224c4c532a.tar.gz
xv6-labs-79cd8b3eedeb1f85d3b19fb6119bd5224c4c532a.tar.bz2
xv6-labs-79cd8b3eedeb1f85d3b19fb6119bd5224c4c532a.zip
Simplify allocuvm/deallocuvm to operate in a contiguous memory model. This makes their interface match up better with proc->sz and also simplifies the callers (it even gets the main body of exec on one page).
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/defs.h b/defs.h
index cc3a721..4de95ad 100644
--- a/defs.h
+++ b/defs.h
@@ -157,8 +157,8 @@ void kvmalloc(void);
void vmenable(void);
pde_t* setupkvm(void);
char* uva2ka(pde_t*, char*);
-int allocuvm(pde_t*, char*, uint);
-int deallocuvm(pde_t *pgdir, char *addr, uint sz);
+int allocuvm(pde_t*, uint, uint);
+int deallocuvm(pde_t*, uint, uint);
void freevm(pde_t*);
void inituvm(pde_t*, char*, uint);
int loaduvm(pde_t*, char*, struct inode *ip, uint, uint);