d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include mptable_pci.c in Xen kernels. It is only meant for systems

Browse Source 
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.
This commit is contained in:
jhb 2011-07-17 01:23:50 +00:00
parent e720a1657c
commit 1545102484
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/files.i386
View File

@ -412,7 +412,7 @@ x86/x86/io_apic.c optional apic
x86/x86/local_apic.c optional apic x86/x86/local_apic.c optional apic
x86/x86/mca.c standard x86/x86/mca.c standard
x86/x86/mptable.c optional apic native 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/msi.c optional apic pci
x86/x86/nexus.c standard x86/x86/nexus.c standard
x86/x86/tsc.c standard x86/x86/tsc.c standard

30
sys/i386/xen/mptable.c
View File

@ -28,29 +28,16 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/malloc.h>
#ifdef NEW_PCIB
#include <sys/rman.h>
#endif
#include <vm/vm.h> #include <vm/vm.h>
#include <vm/vm_param.h> #include <vm/vm_param.h>
#include <vm/pmap.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/frame.h>
#include <machine/intr_machdep.h> #include <machine/intr_machdep.h>
#include <machine/apicvar.h> #include <machine/apicvar.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
#include <xen/hypervisor.h> #include <xen/hypervisor.h>
#include <machine/xen/xen-os.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, SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, mptable_register,
NULL); 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);
}