summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2012-08-22 20:13:43 -0400
committerFrans Kaashoek <[email protected]>2012-08-22 20:13:43 -0400
commit70c555574a140b2696d6f1a5aa524902ef4c820c (patch)
tree9ad7a524dc5fccc1bce341018c7048b25d3837e9
parentb08d16f61d0022cb908f35a27efa100caf27dcf6 (diff)
downloadxv6-labs-70c555574a140b2696d6f1a5aa524902ef4c820c.tar.gz
xv6-labs-70c555574a140b2696d6f1a5aa524902ef4c820c.tar.bz2
xv6-labs-70c555574a140b2696d6f1a5aa524902ef4c820c.zip
Remove unused argument from lapicinit (thanks to Peter Froehlich)
-rw-r--r--defs.h2
-rw-r--r--lapic.c2
-rw-r--r--main.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/defs.h b/defs.h
index efbbe3d..90b5572 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);
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();
}