i386: Unbreak UP kernel building by moving NAPICID around

diff --git a/sys/platform/pc32/apic/apicvar.h b/sys/platform/pc32/apic/apicvar.h
index c6897d8..b90caca 100644 (file)
--- a/sys/platform/pc32/apic/apicvar.h
+++ b/sys/platform/pc32/apic/apicvar.h
@@ -34,6 +34,12 @@
 #define _MACHINE_APICVAR_H_
 
 /*
+ * Size of APIC ID list.
+ * Also used a MAX size of various other arrays.
+ */
+#define NAPICID                256
+
+/*
  * Local && I/O APIC variable definitions.
  */
 

diff --git a/sys/platform/pc32/apic/ioapic.c b/sys/platform/pc32/apic/ioapic.c
index fa75d5a..162dffa 100644 (file)
--- a/sys/platform/pc32/apic/ioapic.c
+++ b/sys/platform/pc32/apic/ioapic.c
@@ -37,6 +37,7 @@
 #include <machine_base/apic/lapic.h>
 #include <machine_base/apic/ioapic.h>
 #include <machine_base/apic/ioapic_abi.h>
+#include <machine_base/apic/apicvar.h>
 
 #define IOAPIC_COUNT_MAX       16
 #define IOAPIC_ID_MASK         (IOAPIC_COUNT_MAX - 1)

diff --git a/sys/platform/pc32/apic/lapic.c b/sys/platform/pc32/apic/lapic.c
index 7f7a5c0..80ebd58 100644 (file)
--- a/sys/platform/pc32/apic/lapic.c
+++ b/sys/platform/pc32/apic/lapic.c
@@ -38,6 +38,7 @@
 #include <machine_base/apic/lapic.h>
 #include <machine_base/apic/ioapic.h>
 #include <machine_base/apic/ioapic_abi.h>
+#include <machine_base/apic/apicvar.h>
 #include <machine_base/icu/icu_var.h>
 #include <machine/segments.h>
 #include <sys/thread2.h>

diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h
index 8dba632..2d4dc67 100644 (file)
--- a/sys/platform/pc32/include/smp.h
+++ b/sys/platform/pc32/include/smp.h
@@ -16,12 +16,6 @@
 
 #ifdef _KERNEL
 
-/*
- * Size of APIC ID list.
- * Also used a MAX size of various other arrays.
- */
-#define NAPICID                256
-
 #if defined(SMP)
 
 #ifndef LOCORE