diff options
| author | ian <ian@FreeBSD.org> | 2014-05-17 20:22:22 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-17 20:22:22 +0000 |
| commit | e111203de4ff2e5b910a02a32c680c216158afc6 (patch) | |
| tree | 9e41be4459b39a47e9fd7b02a28cce35b7b0faaf /sys/conf | |
| parent | 9f4d42e0d5ac9fd53ce7499b7ba78d5c2f392dcf (diff) | |
| download | FreeBSD-src-e111203de4ff2e5b910a02a32c680c216158afc6.zip FreeBSD-src-e111203de4ff2e5b910a02a32c680c216158afc6.tar.gz | |
MFC 264054, 264056
Switch imx6 to using the mpcore per-cpu event timers, but continue to use
the GPT timer, which is fixed-frequency, as a timecounter.
Change NO_EVENTTIMERS from an arm-specific to an MI option, so that it can
be used in MI code.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/conf/options.arm | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/options b/sys/conf/options index 4b66a91..f5ae54c 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -158,6 +158,7 @@ NEW_PCIB opt_global.h NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NO_ADAPTIVE_SX +NO_EVENTTIMERS opt_timer.h NO_SYSCTL_DESCR opt_global.h NSWBUF_MIN opt_swap.h MBUF_PACKET_ZONE_DISABLE opt_global.h diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 87f17b0..a01a59c 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -31,7 +31,6 @@ KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LINUX_BOOT_ABI opt_global.h LOADERRAMADDR opt_global.h -NO_EVENTTIMERS opt_timer.h PHYSADDR opt_global.h SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h |
