From owner-svn-src-all@FreeBSD.ORG  Tue Oct 21 08:01:20 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F6F3106566C;
	Tue, 21 Oct 2008 08:01:20 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F1CE18FC18;
	Tue, 21 Oct 2008 08:01:19 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9L81Jug092791;
	Tue, 21 Oct 2008 08:01:19 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9L81J3b092789;
	Tue, 21 Oct 2008 08:01:19 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810210801.m9L81J3b092789@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 21 Oct 2008 08:01:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184113 - in head/sys/i386: i386 include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2008 08:01:20 -0000

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);