Date: Sun, 17 Jul 2011 01:23:50 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r224120 - in head/sys: conf i386/xen Message-ID: <201107170123.p6H1Novg052062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); -} -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107170123.p6H1Novg052062>