diff options
| author | Austin Clements <amdragon@mit.edu> | 2011-09-02 14:37:04 -0400 | 
|---|---|---|
| committer | Austin Clements <amdragon@mit.edu> | 2011-09-02 14:37:04 -0400 | 
| commit | 2eb214c9dbdd7b7b90997531c171196fc3bd0e9f (patch) | |
| tree | 1015fffeca8f5e107768ab6df411d86c34d1e449 | |
| parent | 91aa0f3296ea0b38dd8d008224271639e5d7b53a (diff) | |
| download | xv6-labs-2eb214c9dbdd7b7b90997531c171196fc3bd0e9f.tar.gz xv6-labs-2eb214c9dbdd7b7b90997531c171196fc3bd0e9f.tar.bz2 xv6-labs-2eb214c9dbdd7b7b90997531c171196fc3bd0e9f.zip | |
clear_pte_u -> clearpteu
| -rw-r--r-- | defs.h | 2 | ||||
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | vm.c | 4 | 
3 files changed, 4 insertions, 4 deletions
| @@ -176,7 +176,7 @@ pde_t*          copyuvm(pde_t*, uint);  void            switchuvm(struct proc*);  void            switchkvm(void);  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  #define NELEM(x) (sizeof(x)/sizeof((x)[0])) @@ -55,7 +55,7 @@ exec(char *path, char **argv)    sz = PGROUNDUP(sz);    if((sz = allocuvm(pgdir, sz, sz + 2*PGSIZE)) == 0)      goto bad; -  clear_pte_u(pgdir, (char*)(sz-2*PGSIZE)); +  clearpteu(pgdir, (char*)(sz - 2*PGSIZE));    sp = sz;    // Push argument strings, prepare rest of stack in ustack. @@ -292,13 +292,13 @@ freevm(pde_t *pgdir)  // Clear PTE_U on a page. Used to create an inaccessible  // page beneath the user stack.  void -clear_pte_u(pde_t *pgdir, char *uva) +clearpteu(pde_t *pgdir, char *uva)  {    pte_t *pte;    pte = walkpgdir(pgdir, uva, 0);    if(pte == 0) -    panic("clear_pte_u"); +    panic("clearpteu");    *pte &= ~PTE_U;  } | 
