diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-10-21 08:01:19 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-10-21 08:01:19 +0000 |
| commit | 0372d65c9901e3a2d3bff89bb81e47b7b58d50c9 (patch) | |
| tree | 3ce78ead301b9e26017d4a77ef2bb1ae79cfc282 | |
| parent | 48c93950a2e011e3403cff8595a5c84ca10c40fd (diff) | |
| download | FreeBSD-src-0372d65c9901e3a2d3bff89bb81e47b7b58d50c9.zip FreeBSD-src-0372d65c9901e3a2d3bff89bb81e47b7b58d50c9.tar.gz | |
don't globally define ipi_bitmap_handler on xen
| -rw-r--r-- | sys/i386/i386/apic_vector.s | 3 | ||||
| -rw-r--r-- | sys/i386/include/smp.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index ccf4b44..d4dd90b 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -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. */ diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index 2924c8b..ef3cbbb 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -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); |
