]> Devi Nivas Git - cs3210-lab0.git/commitdiff
Remove unused argument to setupkvm (thanks to Peter Froehlich)
authorFrans Kaashoek <kaashoek@mit.edu>
Thu, 23 Aug 2012 00:19:37 +0000 (20:19 -0400)
committerFrans Kaashoek <kaashoek@mit.edu>
Thu, 23 Aug 2012 00:19:37 +0000 (20:19 -0400)
defs.h
exec.c
proc.c
vm.c

diff --git a/defs.h b/defs.h
index 90b5572009e57b79930024d2a0ee513b3acc9dfc..12f021b4f49bd95263e73c415b2030296f1710f7 100644 (file)
--- 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
index 312a5c3dd64924b9553245ede10e409ae5783fca..a85e203261ce5e13fd4f6fb71a358ccf75cd4079 100644 (file)
--- 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
index 05cb85f274e8dbcf092ea16c9f95ff098fce6670..bcdbfea8cfdbdb8666983894175d2557d8adf0f8 100644 (file)
--- 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
index fa7b7068b3611e560fefc93ce5bce5e8d69844ff..da3ea3c17d32499a5a977c039db33157ac4e1cf7 100644 (file)
--- 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;