i386 - Get completely rid of APIC_IO

[dragonfly.git] / sys / platform / pc32 / i386 / machdep.c

diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 5c1394b..f545659 100644 (file)
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -118,6 +118,8 @@
 #include <sys/ptrace.h>
 #include <machine/sigframe.h>
 
+#include <sys/machintr.h>
+
 #define PHYSMAP_ENTRIES                10
 
 extern void init386(int first);
@@ -1841,6 +1843,15 @@ do_next:
        avail_end = phys_avail[pa_indx];
 }
 
+#ifdef SMP
+int apic_io_enable = 1; /* Enabled by default */
+TUNABLE_INT("hw.apic_io_enable", &apic_io_enable);
+extern struct machintr_abi MachIntrABI_APIC;
+#endif
+
+extern struct machintr_abi MachIntrABI_ICU;
+struct machintr_abi MachIntrABI;
+
 /*
  * IDT VECTORS:
  *     0       Divide by zero
@@ -1895,6 +1906,17 @@ init386(int first)
                kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE;
 
        /*
+        * Setup MachIntrABI
+        * XXX: Where is the correct place for it?
+        */
+       MachIntrABI = MachIntrABI_ICU;
+#ifdef SMP
+       TUNABLE_INT_FETCH("hw.apic_io_enable", &apic_io_enable);
+       if (apic_io_enable)
+               MachIntrABI = MachIntrABI_APIC;
+#endif
+
+       /*
         * start with one cpu.  Note: with one cpu, ncpus2_shift, ncpus2_mask,
         * and ncpus_fit_mask remain 0.
         */