From 05c90f0058e85c736be19acbaf4fb1099a4a8285 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 5 May 2011 19:03:21 +0800
Subject: [PATCH] i386: Move ioapic_map() from mp_machdep.c to ioapic.c

---
 sys/platform/pc32/apic/ioapic.c     | 8 ++++++++
 sys/platform/pc32/apic/ioapic.h     | 1 +
 sys/platform/pc32/i386/mp_machdep.c | 7 -------
 sys/platform/pc32/include/smp.h     | 1 -
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sys/platform/pc32/apic/ioapic.c b/sys/platform/pc32/apic/ioapic.c
index 235126a724..42cb2ba026 100644
--- a/sys/platform/pc32/apic/ioapic.c
+++ b/sys/platform/pc32/apic/ioapic.c
@@ -30,6 +30,7 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/machintr.h>
+#include <vm/pmap.h>
 #include <machine/globaldata.h>
 #include <machine/smp.h>
 #include <machine/cputypes.h>
@@ -571,3 +572,10 @@ ioapic_alloc_apic_id(int start)
 	}
 	panic("ioapic_unused_apic_id: never reached\n");
 }
+
+void *
+ioapic_map(vm_paddr_t pa)
+{
+	KKASSERT(pa < 0x100000000LL);
+	return pmap_mapdev_uncacheable(pa, PAGE_SIZE);
+}
diff --git a/sys/platform/pc32/apic/ioapic.h b/sys/platform/pc32/apic/ioapic.h
index f680c4148c..f99df805b3 100644
--- a/sys/platform/pc32/apic/ioapic.h
+++ b/sys/platform/pc32/apic/ioapic.h
@@ -61,5 +61,6 @@ void	ioapic_pin_setup(void *, int, int,
 void	ioapic_extpin_setup(void *, int, int);
 int	ioapic_extpin_gsi(void);
 int	ioapic_gsi(int, int);
+void	*ioapic_map(vm_paddr_t);
 
 #endif	/* !_ARCH_APIC_IOAPIC_H_ */
diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index 8750e1db08..c854cff7fa 100644
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -344,13 +344,6 @@ mp_set_cpuids(int cpu_id, int apic_id)
 	ID_TO_CPU(apic_id) = cpu_id;
 }
 
-void *
-ioapic_map(vm_paddr_t pa)
-{
-	KKASSERT(pa < 0x100000000LL);
-	return pmap_mapdev_uncacheable(pa, PAGE_SIZE);
-}
-
 /*
  * start each AP in our list
  */
diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h
index c346f6f96b..77acde88ac 100644
--- a/sys/platform/pc32/include/smp.h
+++ b/sys/platform/pc32/include/smp.h
@@ -86,7 +86,6 @@ extern struct apic_intmapinfo	int_to_apicintpin[];
 extern struct pcb		stoppcbs[];
 
 /* functions in mp_machdep.c */
-void	*ioapic_map(vm_paddr_t);
 u_int	mp_bootaddress		(u_int);
 void	mp_start		(void);
 void	mp_announce		(void);
-- 
2.41.0