From 2eb214c9dbdd7b7b90997531c171196fc3bd0e9f Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 2 Sep 2011 14:37:04 -0400 Subject: [PATCH] clear_pte_u -> clearpteu --- defs.h | 2 +- exec.c | 2 +- vm.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defs.h b/defs.h index 4b3eec9..921c7bf 100644 --- a/defs.h +++ b/defs.h @@ -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])) diff --git a/exec.c b/exec.c index af9e006..4be65a4 100644 --- a/exec.c +++ b/exec.c @@ -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. diff --git a/vm.c b/vm.c index 10687fc..3e52b44 100644 --- a/vm.c +++ b/vm.c @@ -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; }