7 files changed, 9 insertions, 9 deletions
diff --git a/defs.h b/defs.h
index 7f1e88d..23b1019 100644
--- a/defs.h
+++ b/defs.h
@@ -74,7 +74,7 @@ void            kbdintr(void);
 int             cpunum(void);
 extern volatile uint*    lapic;
 void            lapiceoi(void);
-void            lapicinit(int);
+void            lapicinit(void);
 void            lapicstartap(uchar, uint);
 void            microdelay(int);
 
@@ -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 312a5c3..a85e203 100644
--- 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/lapic.c b/lapic.c
index effceb1..94b484f 100644
--- a/lapic.c
+++ b/lapic.c
@@ -50,7 +50,7 @@ lapicw(int index, int value)
 //PAGEBREAK!
 
 void
-lapicinit(int c)
+lapicinit(void)
 {
   if(!lapic) 
     return;
diff --git a/main.c b/main.c
index c0c3a91..712958f 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@ main(void)
   kinit1(end, P2V(4*1024*1024)); // phys page allocator
   kvmalloc();      // kernel page table
   mpinit();        // collect info about this machine
-  lapicinit(mpbcpu());
+  lapicinit();
   seginit();       // set up segments
   cprintf("\ncpu%d: starting xv6\n\n", cpu->id);
   picinit();       // interrupt controller
@@ -48,7 +48,7 @@ mpenter(void)
 {
   switchkvm(); 
   seginit();
-  lapicinit(cpunum());
+  lapicinit();
   mpmain();
 }
 
diff --git a/proc.c b/proc.c
index 05cb85f..bcdbfea 100644
--- 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 fa7b706..da3ea3c 100644
--- 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;
diff --git a/wc.c b/wc.c
index b728d27..d6a54df 100644
--- a/wc.c
+++ b/wc.c
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
 
   for(i = 1; i < argc; i++){
     if((fd = open(argv[i], 0)) < 0){
-      printf(1, "cat: cannot open %s\n", argv[i]);
+      printf(1, "wc: cannot open %s\n", argv[i]);
       exit();
     }
     wc(fd, argv[i]);