xv6

commit 6a770560639decfeb76d83c27377ee25ec19d494
parent 6b815a95e4159143725c536c688948c6e561edb4
Author: Brian Swetland <swetland@frotz.net>
Date:   Sun,  5 Jan 2014 18:50:28 -0800

Attempt to use ACPI to configure multiprocessor mode.

Fails back to the BIOS MP table based mpinit() if the ACPI tables
are not found or not usable.

Diffstat:
M
kernel/main.c
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/main.c b/kernel/main.c
@@ -20,7 +20,8 @@ main(void)
   uartearlyinit();
   kinit1(end, P2V(4*1024*1024)); // phys page allocator
   kvmalloc();      // kernel page table
-  mpinit();        // collect info about this machine
+  if (acpiinit()) // try to use acpi for machine info
+    mpinit();      // otherwise use bios MP tables
   lapicinit();
   seginit();       // set up segments
   cprintf("\ncpu%d: starting xv6\n\n", cpu->id);