From owner-svn-src-head@FreeBSD.ORG  Sun Jul 17 01:23:50 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C20C0106566B;
	Sun, 17 Jul 2011 01:23:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98C178FC18;
	Sun, 17 Jul 2011 01:23:50 +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 p6H1NoZi052065;
	Sun, 17 Jul 2011 01:23:50 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6H1Novg052062;
	Sun, 17 Jul 2011 01:23:50 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201107170123.p6H1Novg052062@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 17 Jul 2011 01:23:50 +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: r224120 - in head/sys: conf i386/xen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jul 2011 01:23:50 -0000

Author: jhb
Date: Sun Jul 17 01:23:50 2011
New Revision: 224120
URL: http://svn.freebsd.org/changeset/base/224120

Log:
  Don't include mptable_pci.c in Xen kernels.  It is only meant for systems
  that truly have an MPTable.  The MPTable code in Xen is really a Xen
  specific CPU enumerator and probably shouldn't be using the mptable name
  at all.

Modified:
  head/sys/conf/files.i386
  head/sys/i386/xen/mptable.c

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sat Jul 16 22:01:18 2011	(r224119)
+++ head/sys/conf/files.i386	Sun Jul 17 01:23:50 2011	(r224120)
@@ -412,7 +412,7 @@ x86/x86/io_apic.c		optional apic
 x86/x86/local_apic.c		optional apic
 x86/x86/mca.c			standard
 x86/x86/mptable.c		optional apic native
-x86/x86/mptable_pci.c		optional apic pci
+x86/x86/mptable_pci.c		optional apic native pci
 x86/x86/msi.c			optional apic pci
 x86/x86/nexus.c			standard
 x86/x86/tsc.c			standard

Modified: head/sys/i386/xen/mptable.c
==============================================================================
--- head/sys/i386/xen/mptable.c	Sat Jul 16 22:01:18 2011	(r224119)
+++ head/sys/i386/xen/mptable.c	Sun Jul 17 01:23:50 2011	(r224120)
@@ -28,29 +28,16 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
-#ifdef NEW_PCIB
-#include <sys/rman.h>
-#endif
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#ifdef NEW_PCIB
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcib_private.h>
-#endif
-#include <x86/apicreg.h>
-#include <x86/mptable.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
-#include <machine/md_var.h>
-#include <machine/specialreg.h>
 
 #include <xen/hypervisor.h>
 #include <machine/xen/xen-os.h>
@@ -118,20 +105,3 @@ mptable_register(void *dummy __unused)
 }
 SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, mptable_register,
     NULL);
-
-
-
-int
-mptable_pci_probe_table(int bus)
-{
-
-	return (0);
-}
-
-int
-mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin)
-{
-
-	return (0);
-}
-