diff options
| author | Robert Morris <rtm@csail.mit.edu> | 2016-08-11 13:55:13 -0400 | 
|---|---|---|
| committer | Robert Morris <rtm@csail.mit.edu> | 2016-08-11 13:55:13 -0400 | 
| commit | c779cc2be1ad47461bd48f386d8f8a5b58a85f42 (patch) | |
| tree | 5d179152c2a3851feb9086948024495af38e156f | |
| parent | 241188276c110127ae26978e8b18ddab0b823b9d (diff) | |
| download | xv6-labs-c779cc2be1ad47461bd48f386d8f8a5b58a85f42.tar.gz xv6-labs-c779cc2be1ad47461bd48f386d8f8a5b58a85f42.tar.bz2 xv6-labs-c779cc2be1ad47461bd48f386d8f8a5b58a85f42.zip | |
main comments
| -rw-r--r-- | main.c | 13 | 
1 files changed, 6 insertions, 7 deletions
| @@ -19,13 +19,13 @@ main(void)  {    kinit1(end, P2V(4*1024*1024)); // phys page allocator    kvmalloc();      // kernel page table -  mpinit();        // collect info about this machine -  lapicinit(); -  seginit();       // set up segments +  mpinit();        // detect other processors +  lapicinit();     // interrupt controller +  seginit();       // segment descriptors    cprintf("\ncpu%d: starting xv6\n\n", cpu->id); -  picinit();       // interrupt controller +  picinit();       // another interrupt controller    ioapicinit();    // another interrupt controller -  consoleinit();   // I/O devices & their interrupts +  consoleinit();   // console hardware    uartinit();      // serial port    pinit();         // process table    tvinit();        // trap vectors @@ -37,8 +37,7 @@ main(void)    startothers();   // start other processors    kinit2(P2V(4*1024*1024), P2V(PHYSTOP)); // must come after startothers()    userinit();      // first user process -  // Finish setting up this processor in mpmain. -  mpmain(); +  mpmain();        // finish this processor's setup  }  // Other CPUs jump here from entryother.S. | 
