diff options
| author | attilio <attilio@FreeBSD.org> | 2010-03-29 15:39:17 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2010-03-29 15:39:17 +0000 |
| commit | 78bdfe798ddad0bb64dbd05f0eeb4620cd19028b (patch) | |
| tree | 0257702632632733abbbae6ff709c8570ebf59ea /sys/conf | |
| parent | d80da68cdee8a4d63c7e181eb4e46f75c701ea56 (diff) | |
| download | FreeBSD-src-78bdfe798ddad0bb64dbd05f0eeb4620cd19028b.zip FreeBSD-src-78bdfe798ddad0bb64dbd05f0eeb4620cd19028b.tar.gz | |
MFC r199852, r202387, r202441, r202534:
Handling all the three clocks with the LAPIC may lead to aliasing for
softclock and profclock.
Revert the change when the LAPIC started taking charge of all three of
them.
Sponsored by: Sandvine Incorporated
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.pc98 | 4 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 002cf86..b4e171d 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -194,7 +194,7 @@ i386/ibcs2/ibcs2_util.c optional ibcs2 i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -240,7 +240,7 @@ pc98/cbus/gdc.c optional gdc pc98/cbus/nmi.c standard pc98/cbus/olpt.c optional olpt pc98/cbus/pckbd.c optional pckbd -pc98/cbus/pcrtc.c standard +pc98/cbus/pcrtc.c optional atpic pc98/cbus/pmc.c optional pmc pc98/cbus/scgdcrndr.c optional sc gdc pc98/cbus/scterm-sck.c optional sc diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index a8e40e1..333ec6a 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -106,6 +106,7 @@ NETGRAPH_CRONYX opt_ng_cronyx.h # Device options DEV_APIC opt_apic.h +DEV_ATPIC opt_atpic.h DEV_NPX opt_npx.h ASR_COMPAT opt_asr.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index dca3d69..a10737b 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -90,6 +90,7 @@ PC98 opt_global.h # Device options DEV_APIC opt_apic.h +DEV_ATPIC opt_atpic.h DEV_MECIA opt_mecia.h DEV_NPX opt_npx.h |
