From owner-svn-src-all@FreeBSD.ORG Sun May 20 08:17:21 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A1956106567B; Sun, 20 May 2012 08:17:21 +0000 (UTC) (envelope-from iwasaki@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B80F8FC17; Sun, 20 May 2012 08:17:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4K8HLOp076392; Sun, 20 May 2012 08:17:21 GMT (envelope-from iwasaki@svn.freebsd.org) Received: (from iwasaki@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4K8HLAu076389; Sun, 20 May 2012 08:17:21 GMT (envelope-from iwasaki@svn.freebsd.org) Message-Id: <201205200817.q4K8HLAu076389@svn.freebsd.org> From: Mitsuru IWASAKI Date: Sun, 20 May 2012 08:17:21 +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: r235683 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2012 08:17:21 -0000 Author: iwasaki Date: Sun May 20 08:17:20 2012 New Revision: 235683 URL: http://svn.freebsd.org/changeset/base/235683 Log: Remove cpususpend IDT vector for XEN. This broke XEN kernel building. 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 Sun May 20 06:35:22 2012 (r235682) +++ head/sys/i386/i386/apic_vector.s Sun May 20 08:17:20 2012 (r235683) @@ -336,6 +336,7 @@ IDTVEC(cpustop) /* * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. */ +#ifndef XEN .text SUPERALIGN_TEXT IDTVEC(cpususpend) @@ -350,6 +351,7 @@ IDTVEC(cpususpend) POP_FRAME jmp doreti_iret +#endif /* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. Modified: head/sys/i386/include/smp.h ============================================================================== --- head/sys/i386/include/smp.h Sun May 20 06:35:22 2012 (r235682) +++ head/sys/i386/include/smp.h Sun May 20 08:17:20 2012 (r235683) @@ -60,7 +60,9 @@ inthand_t /* functions in mp_machdep.c */ void cpu_add(u_int apic_id, char boot_cpu); void cpustop_handler(void); +#ifndef XEN void cpususpend_handler(void); +#endif void init_secondary(void); void ipi_all_but_self(u_int ipi); #ifndef XEN