lapic hwid nits

c6bf8754 · Silas Boyd-Wickizer · 207c8bac · c6bf8754 · c6bf8754 · c6bf8754
--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -139,11 +139,10 @@ void            kmemprint(void);
 void            kbdintr(void);

 // lapic.c
-hwid_t          lapicid(void);
-void            lapicstartap(hwid, u32 addr);
+void            lapicstartap(hwid_t, u32 addr);
 void            lapiceoi(void);
-void            lapic_tlbflush(hwid);
-void            lapic_sampconf(hwid);
+void            lapic_tlbflush(hwid_t);
+void            lapic_sampconf(hwid_t);
 void            lapicpc(char mask);

 // mp.c

--- a/kernel/hwvm.cc
+++ b/kernel/hwvm.cc
@@ -209,6 +209,8 @@ freevm(pgmap *pml4)
 void
 inittls(void)
 {
+  extern hwid_t lapicid(void);
+
  struct cpu *c;
  cpuid_t id = -1;


--- a/kernel/main.cc
+++ b/kernel/main.cc
@@ -102,7 +102,6 @@ cmain(u64 mbmagic, u64 mbaddr)
  initmp();
  inittls();       // thread local storage

-  initconsole();
  initseg();
  initsperf();
  inittrap();
@@ -115,6 +114,7 @@ cmain(u64 mbmagic, u64 mbaddr)
  initbio();       // buffer cache
  initinode();     // inode cache
  initdisk();      // disk
+  initconsole();
  initwq();
  initsamp();
  initlockstat();