diff options
author | jhb <jhb@FreeBSD.org> | 2011-07-17 01:23:50 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2011-07-17 01:23:50 +0000 |
commit | 1545102484217412172a3aecedecf580dff77637 (patch) | |
tree | e7d0f37409a1a3938a76554ecf336b153861ea8c /sys | |
parent | e720a1657c320cd06d5982011a451462436ea5f7 (diff) | |
download | FreeBSD-src-1545102484217412172a3aecedecf580dff77637.zip FreeBSD-src-1545102484217412172a3aecedecf580dff77637.tar.gz |
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.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/conf/files.i386 | 2 | ||||
-rw-r--r-- | sys/i386/xen/mptable.c | 30 |
2 files changed, 1 insertions, 31 deletions
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 41a1772..a19b93c 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -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 diff --git a/sys/i386/xen/mptable.c b/sys/i386/xen/mptable.c index df9803c..0c1efe8 100644 --- a/sys/i386/xen/mptable.c +++ b/sys/i386/xen/mptable.c @@ -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); -} - |