Remove unused argument from lapicinit (thanks to Peter Froehlich)

diff --git a/defs.h b/defs.h
index efbbe3d63d5544b2a9c3d7388052dd7493564d9c..90b5572009e57b79930024d2a0ee513b3acc9dfc 100644 (file)
--- 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);
 

diff --git a/lapic.c b/lapic.c
index effceb139f0aac68980d93145236bcb7c08669bd..94b484fec475ebd5062f27e589c91c8b5a5c9240 100644 (file)
--- 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 c0c3a917bbb9ab9a6e48cfd4140bf48f037d9249..712958f1830dae5b1614f9a093bdfef36947a3a1 100644 (file)
--- 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();
 }