xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 4ce832ddd280a4cea36e16115ddeaea74213314e
parent 70c555574a140b2696d6f1a5aa524902ef4c820c
Author: Frans Kaashoek <kaashoek@mit.edu>
Date:   Wed, 22 Aug 2012 20:19:37 -0400

Remove unused argument to setupkvm (thanks to Peter Froehlich)

Diffstat:
Mdefs.h | 2+-
Mexec.c | 2+-
Mproc.c | 2+-
Mvm.c | 2+-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/defs.h b/defs.h @@ -164,7 +164,7 @@ void uartputc(int); void seginit(void); void kvmalloc(void); void vmenable(void); -pde_t* setupkvm(); +pde_t* setupkvm(void); char* uva2ka(pde_t*, char*); int allocuvm(pde_t*, uint, uint); int deallocuvm(pde_t*, uint, uint); diff --git a/exec.c b/exec.c @@ -29,7 +29,7 @@ exec(char *path, char **argv) if(elf.magic != ELF_MAGIC) goto bad; - if((pgdir = setupkvm(kalloc)) == 0) + if((pgdir = setupkvm()) == 0) goto bad; // Load program into memory. diff --git a/proc.c b/proc.c @@ -83,7 +83,7 @@ userinit(void) p = allocproc(); initproc = p; - if((p->pgdir = setupkvm(kalloc)) == 0) + if((p->pgdir = setupkvm()) == 0) panic("userinit: out of memory?"); inituvm(p->pgdir, _binary_initcode_start, (int)_binary_initcode_size); p->sz = PGSIZE; diff --git a/vm.c b/vm.c @@ -126,7 +126,7 @@ static struct kmap { // Set up kernel part of a page table. pde_t* -setupkvm() +setupkvm(void) { pde_t *pgdir; struct kmap *k;