From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Mon, 13 Jun 2011 11:13:21 +0000 (+0800)
Subject: i386: Unbreak UP kernel building by moving NAPICID around
X-Git-Tag: v2.12.0~465
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/bfcc9e9b3a3031455e788aac413e91985c148035

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 c6897d8d0c..b90caca1f6 100644
--- a/sys/platform/pc32/apic/apicvar.h
+++ b/sys/platform/pc32/apic/apicvar.h
@@ -33,6 +33,12 @@
 #ifndef _MACHINE_APICVAR_H_
 #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 fa75d5af2e..162dffaa77 100644
--- 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 7f7a5c0938..80ebd58fac 100644
--- 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 8dba63232a..2d4dc67f0f 100644
--- 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