Merge branch 'ioapic'

diff --cc Makefile
Simple merge

diff --cc kernel/setup.c
index 19ac1f98664006e32d724bb1de5d709c67b7af49,093821e14f676b4748784fd0656bbefd375566a1..6c2de7221616e5175237a55846785790c13b24c1
--- 1/kernel/setup.c
--- 2/kernel/setup.c
+++ b/kernel/setup.c
@@@ -74,10 -74,14 +74,8 @@@ void print_kernel_version() 
      printk(version);
  }
  
- void parse_rsdt(void* addr);
- 
  void setup_kernel() {
 -    printk("sysenter esp mode: %s\n",
 -#if FIXED_SYSENTER_ESP_MODE
 -           "fixed to &tss.esp0"
 -#else
 -           "use task union stack"
 -#endif
 -    );
 +    printk("sysenter esp mode: fixed to &tss.esp0\n");
  
      init_mm();