diff options
| author | markm <markm@FreeBSD.org> | 2013-08-30 11:38:34 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2013-08-30 11:38:34 +0000 |
| commit | ff7909302f8ec4c467a0d7bb2c37c2700d394e7f (patch) | |
| tree | f9372a133e937ecfa0e144aca5abd2a7fcd83233 /sys/conf | |
| parent | 6eed6ab7e64307bf3e41ef63d154359d83a3ba04 (diff) | |
| parent | 0030cdac07df412f040b7616431b47c1265e0e69 (diff) | |
| download | FreeBSD-src-ff7909302f8ec4c467a0d7bb2c37c2700d394e7f.zip FreeBSD-src-ff7909302f8ec4c467a0d7bb2c37c2700d394e7f.tar.gz | |
MFC
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64 index 7b1c164..97f4d3c 100644 --- a/sys/conf/Makefile.amd64 +++ b/sys/conf/Makefile.amd64 @@ -41,8 +41,6 @@ MKMODULESENV+= MACHINE=amd64 # XXX: clang integrated-as doesn't grok .codeNN directives yet ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS} -ASM_CFLAGS.ia32_sigtramp.S= ${CLANG_NO_IAS} -ASM_CFLAGS.linux32_locore.s= ${CLANG_NO_IAS} ASM_CFLAGS.mpboot.S= ${CLANG_NO_IAS} ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}} diff --git a/sys/conf/files b/sys/conf/files index 1d48b0c..b7b1108 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2499,7 +2499,7 @@ dev/xen/control/control.c optional xen | xenhvm dev/xen/netback/netback.c optional xen | xenhvm dev/xen/netfront/netfront.c optional xen | xenhvm dev/xen/xenpci/xenpci.c optional xenpci -dev/xen/xenpci/evtchn.c optional xenpci +dev/xen/timer/timer.c optional xen | xenhvm dev/xl/if_xl.c optional xl pci dev/xl/xlphy.c optional xl pci fs/deadfs/dead_vnops.c standard @@ -3815,7 +3815,6 @@ vm/vm_zeroidle.c standard vm/vnode_pager.c standard xen/gnttab.c optional xen | xenhvm xen/features.c optional xen | xenhvm -xen/evtchn/evtchn.c optional xen xen/evtchn/evtchn_dev.c optional xen | xenhvm xen/xenbus/xenbus_if.m optional xen | xenhvm xen/xenbus/xenbus.c optional xen | xenhvm diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 1d5fa76..6d35d1f 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -531,3 +531,5 @@ x86/x86/mptable_pci.c optional mptable pci x86/x86/msi.c optional pci x86/x86/nexus.c standard x86/x86/tsc.c standard +x86/xen/hvm.c optional xenhvm +x86/xen/xen_intr.c optional xen | xenhvm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 4f8f8ed..2ac0b61 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -483,8 +483,6 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 i386/xen/clock.c optional xen -i386/xen/xen_clock_util.c optional xen -i386/xen/xen_rtc.c optional xen i386/isa/elink.c optional ep | ie i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer @@ -568,3 +566,5 @@ 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 +x86/xen/hvm.c optional xenhvm +x86/xen/xen_intr.c optional xen | xenhvm |
