svn commit: r184113 - in head/sys/i386: i386 include
Kip Macy
kmacy at FreeBSD.org
Tue Oct 21 08:01:20 UTC 2008
Author: kmacy
Date: Tue Oct 21 08:01:19 2008
New Revision: 184113
URL: http://svn.freebsd.org/changeset/base/184113
Log:
don't globally define ipi_bitmap_handler on xen
Modified:
head/sys/i386/i386/apic_vector.s
head/sys/i386/include/smp.h
Modified: head/sys/i386/i386/apic_vector.s
==============================================================================
--- head/sys/i386/i386/apic_vector.s Tue Oct 21 06:39:40 2008 (r184112)
+++ head/sys/i386/i386/apic_vector.s Tue Oct 21 08:01:19 2008 (r184113)
@@ -270,6 +270,7 @@ IDTVEC(invlcache)
/*
* Handler for IPIs sent via the per-cpu IPI bitmap.
*/
+#ifndef XEN
.text
SUPERALIGN_TEXT
IDTVEC(ipi_intr_bitmap_handler)
@@ -284,7 +285,7 @@ IDTVEC(ipi_intr_bitmap_handler)
call ipi_bitmap_handler
MEXITCOUNT
jmp doreti
-
+#endif
/*
* Executed by a CPU when it receives an IPI_STOP from another CPU.
*/
Modified: head/sys/i386/include/smp.h
==============================================================================
--- head/sys/i386/include/smp.h Tue Oct 21 06:39:40 2008 (r184112)
+++ head/sys/i386/include/smp.h Tue Oct 21 08:01:19 2008 (r184113)
@@ -66,7 +66,9 @@ void cpustop_handler(void);
void init_secondary(void);
void ipi_selected(u_int cpus, u_int ipi);
void ipi_all_but_self(u_int ipi);
+#ifndef XEN
void ipi_bitmap_handler(struct trapframe frame);
+#endif
u_int mp_bootaddress(u_int);
int mp_grab_cpu_hlt(void);
void smp_cache_flush(void);
More information about the svn-src-head
mailing list