Remove unused argument from lapicinit (thanks to Peter Froehlich)

This commit is contained in:
Frans Kaashoek 2012-08-22 20:13:43 -04:00
parent b08d16f61d
commit 70c555574a
3 changed files with 4 additions and 4 deletions

2
defs.h
View file

@ -74,7 +74,7 @@ void kbdintr(void);
int cpunum(void); int cpunum(void);
extern volatile uint* lapic; extern volatile uint* lapic;
void lapiceoi(void); void lapiceoi(void);
void lapicinit(int); void lapicinit(void);
void lapicstartap(uchar, uint); void lapicstartap(uchar, uint);
void microdelay(int); void microdelay(int);

View file

@ -50,7 +50,7 @@ lapicw(int index, int value)
//PAGEBREAK! //PAGEBREAK!
void void
lapicinit(int c) lapicinit(void)
{ {
if(!lapic) if(!lapic)
return; return;

4
main.c
View file

@ -20,7 +20,7 @@ main(void)
kinit1(end, P2V(4*1024*1024)); // phys page allocator kinit1(end, P2V(4*1024*1024)); // phys page allocator
kvmalloc(); // kernel page table kvmalloc(); // kernel page table
mpinit(); // collect info about this machine mpinit(); // collect info about this machine
lapicinit(mpbcpu()); lapicinit();
seginit(); // set up segments seginit(); // set up segments
cprintf("\ncpu%d: starting xv6\n\n", cpu->id); cprintf("\ncpu%d: starting xv6\n\n", cpu->id);
picinit(); // interrupt controller picinit(); // interrupt controller
@ -48,7 +48,7 @@ mpenter(void)
{ {
switchkvm(); switchkvm();
seginit(); seginit();
lapicinit(cpunum()); lapicinit();
mpmain(); mpmain();
} }