greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clear_pte_u -> clearpteu

Browse source
This commit is contained in:
Austin Clements 2011-09-02 14:37:04 -04:00
parent 91aa0f3296
commit 2eb214c9db
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
defs.h
View file

@ -176,7 +176,7 @@ pde_t* copyuvm(pde_t*, uint);
void switchuvm(struct proc*); void switchuvm(struct proc*);
void switchkvm(void); void switchkvm(void);
int copyout(pde_t*, uint, void*, uint); int copyout(pde_t*, uint, void*, uint);
void clear_pte_u(pde_t *pgdir, char *uva); void clearpteu(pde_t *pgdir, char *uva);
// number of elements in fixed-size array // number of elements in fixed-size array
#define NELEM(x) (sizeof(x)/sizeof((x)[0])) #define NELEM(x) (sizeof(x)/sizeof((x)[0]))

2
exec.c
View file

@ -55,7 +55,7 @@ exec(char *path, char **argv)
sz = PGROUNDUP(sz); sz = PGROUNDUP(sz);
if((sz = allocuvm(pgdir, sz, sz + 2*PGSIZE)) == 0) if((sz = allocuvm(pgdir, sz, sz + 2*PGSIZE)) == 0)
goto bad; goto bad;
clear_pte_u(pgdir, (char*)(sz-2*PGSIZE)); clearpteu(pgdir, (char*)(sz - 2*PGSIZE));
sp = sz; sp = sz;
// Push argument strings, prepare rest of stack in ustack. // Push argument strings, prepare rest of stack in ustack.

4
vm.c
View file

@ -292,13 +292,13 @@ freevm(pde_t *pgdir)
// Clear PTE_U on a page. Used to create an inaccessible // Clear PTE_U on a page. Used to create an inaccessible
// page beneath the user stack. // page beneath the user stack.
void void
clear_pte_u(pde_t *pgdir, char *uva) clearpteu(pde_t *pgdir, char *uva)
{ {
pte_t *pte; pte_t *pte;
pte = walkpgdir(pgdir, uva, 0); pte = walkpgdir(pgdir, uva, 0);
if(pte == 0) if(pte == 0)
panic("clear_pte_u"); panic("clearpteu");
*pte &= ~PTE_U; *pte &= ~PTE_U;
} }