summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2011-09-01 12:02:49 -0400
committerRobert Morris <[email protected]>2011-09-01 12:02:49 -0400
commit5a236924444db768813d726ae165d263856d8bff (patch)
tree7f6ba51bec015a7c467f8489d15b2133dfda37bc /vm.c
parent15997d58497f4c716c227787acf9591439e5fe9c (diff)
downloadxv6-labs-5a236924444db768813d726ae165d263856d8bff.tar.gz
xv6-labs-5a236924444db768813d726ae165d263856d8bff.tar.bz2
xv6-labs-5a236924444db768813d726ae165d263856d8bff.zip
fix usertests to correctly test what happens when you call
exec() with arguments that don't fit on a single page.
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vm.c b/vm.c
index 32775a1..7bda3dd 100644
--- a/vm.c
+++ b/vm.c
@@ -68,7 +68,8 @@ walkpgdir(pde_t *pgdir, const void *va, char* (*alloc)(void))
// physical addresses starting at pa. va and size might not
// be page-aligned.
static int
-mappages(pde_t *pgdir, void *va, uint size, uint pa, int perm, char* (*alloc)(void))
+mappages(pde_t *pgdir, void *va, uint size, uint pa,
+ int perm, char* (*alloc)(void))
{
char *a, *last;
pte_t *pte;
@@ -343,7 +344,7 @@ copyout(pde_t *pgdir, uint va, void *p, uint len)
{
char *buf, *pa0;
uint n, va0;
-
+
buf = (char*)p;
while(len > 0){
va0 = (uint)PGROUNDDOWN(va);