diff --git a/sys/arm/conf/A10 b/sys/arm/conf/A10 index 1f8b470d9581..9939bc69aeb8 100644 --- a/sys/arm/conf/A10 +++ b/sys/arm/conf/A10 @@ -28,7 +28,6 @@ options INTRNG options SOC_ALLWINNER_A10 options SOC_ALLWINNER_A13 -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM options MULTIDELAY diff --git a/sys/arm/conf/ALLWINNER b/sys/arm/conf/ALLWINNER index b3258e54c97c..ae7e41674364 100644 --- a/sys/arm/conf/ALLWINNER +++ b/sys/arm/conf/ALLWINNER @@ -32,7 +32,6 @@ options SOC_ALLWINNER_A31S options SOC_ALLWINNER_A83T options SOC_ALLWINNER_H3 -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM diff --git a/sys/arm/conf/ALPINE b/sys/arm/conf/ALPINE index 4160f9574a4a..64a9f6a70b1f 100644 --- a/sys/arm/conf/ALPINE +++ b/sys/arm/conf/ALPINE @@ -25,7 +25,6 @@ include "../annapurna/alpine/std.alpine" makeoptions MODULES_OVERRIDE="" makeoptions WERROR="-Werror" -options HZ=100 options SCHED_4BSD # 4BSD scheduler options SMP # Enable multiple cores diff --git a/sys/arm/conf/AML8726 b/sys/arm/conf/AML8726 index a90cccfdbc98..e41c05ad3591 100644 --- a/sys/arm/conf/AML8726 +++ b/sys/arm/conf/AML8726 @@ -23,7 +23,6 @@ ident AML8726 include "std.armv6" include "../amlogic/aml8726/std.aml8726" -options HZ=100 options SCHED_ULE # ULE scheduler options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options LINUX_BOOT_ABI diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index 3176a8186c1f..aa5f23d4d152 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -19,8 +19,6 @@ options MD_ROOT options ROOTDEVNAME=\"/dev/da0s1a\" options SCHED_ULE # ULE scheduler -#options SCHED_4BSD # 4BSD scheduler - options SMP # Pseudo devices diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP index 5e107ddde035..19a11ea6b5eb 100644 --- a/sys/arm/conf/ARMADAXP +++ b/sys/arm/conf/ARMADAXP @@ -27,7 +27,6 @@ options SOC_MV_ARMADAXP makeoptions WERROR="-Werror" -options HZ=1000 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index 312659b4e3a5..ad76fcaf5503 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -30,7 +30,6 @@ makeoptions MODULES_EXTRA="dtb/am335x am335x_dmtpps" options INTRNG -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index ad4205628da5..b5102ddf2c3d 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -21,7 +21,6 @@ makeoptions WERROR="-Werror" include "std.armv6" -options HZ=100 options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB index 5fa907c01b4c..8d25ea6539ce 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -22,8 +22,6 @@ include "IMX53" ident IMX53-QSB -options HZ=250 # 4ms scheduling quantum - # required for netbooting #options BOOTP #options BOOTP_COMPAT diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 6000566ded27..f8340334f395 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -26,7 +26,6 @@ options INTRNG options SOC_IMX6 -options HZ=500 # Scheduling quantum is 2 milliseconds. options SCHED_ULE # ULE scheduler #options NFSD # Network Filesystem Server options INCLUDE_CONFIG_FILE # Include this file in kernel diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index 158a9b7f1e13..b98c4b020396 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -30,7 +30,6 @@ hints "PANDABOARD.hints" include "std.armv6" include "../ti/omap4/pandaboard/std.pandaboard" -options HZ=100 options SCHED_ULE # ULE scheduler options PLATFORM options SMP # Enable multiple cores diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index 7528c0ca39e5..7f771593c75e 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -23,7 +23,6 @@ ident RK3188 include "std.armv6" include "../rockchip/std.rk30xx" -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B index 58d05cae03ea..3bdcb58e644c 100644 --- a/sys/arm/conf/RPI-B +++ b/sys/arm/conf/RPI-B @@ -26,7 +26,6 @@ include "../broadcom/bcm2835/std.bcm2835" options INTRNG -options HZ=100 options SCHED_4BSD # 4BSD scheduler options PLATFORM diff --git a/sys/arm/conf/RPI2 b/sys/arm/conf/RPI2 index 75e1b7ef029b..1dc5f9262b7e 100644 --- a/sys/arm/conf/RPI2 +++ b/sys/arm/conf/RPI2 @@ -26,7 +26,6 @@ include "../broadcom/bcm2835/std.bcm2836" options INTRNG -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores options PLATFORM diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common index 964c98a5d527..91020020e716 100644 --- a/sys/arm/conf/SOCKIT.common +++ b/sys/arm/conf/SOCKIT.common @@ -25,7 +25,6 @@ makeoptions MODULES_OVERRIDE="" makeoptions WERROR="-Werror" -options HZ=100 options SCHED_ULE # ULE scheduler options SMP # Enable multiple cores diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index 663a948e0c42..34e84096da86 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -23,7 +23,6 @@ include "../nvidia/tegra124/std.tegra124" ident TEGRA124 -options HZ=100 # Scheduling quantum is 10 milliseconds. options SCHED_ULE # ULE scheduler options PLATFORM # Platform based SoC options PLATFORM_SMP diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB index 63feaffb501d..7cfc5f6759c0 100644 --- a/sys/arm/conf/VERSATILEPB +++ b/sys/arm/conf/VERSATILEPB @@ -29,7 +29,6 @@ makeoptions MODULES_OVERRIDE="" options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options HZ=100 options SCHED_4BSD # 4BSD scheduler options LINUX_BOOT_ABI # Process metadata passed from Linux boot loaders diff --git a/sys/arm/conf/VIRT b/sys/arm/conf/VIRT index 007e24cf835c..ad266c7ceff3 100644 --- a/sys/arm/conf/VIRT +++ b/sys/arm/conf/VIRT @@ -23,8 +23,7 @@ ident VIRT include "std.armv6" include "../qemu/std.virt" -options HZ=100 -options SCHED_ULE # 4BSD scheduler +options SCHED_ULE # ULE scheduler options PLATFORM options PLATFORM_SMP options SMP # Enable multiple cores diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index d834b55a8b5b..2174aeea7a08 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -24,7 +24,6 @@ include "../freescale/vybrid/std.vybrid" makeoptions WERROR="-Werror" -options HZ=100 options SCHED_4BSD # 4BSD scheduler #options NANDFS # NAND Filesystem #options SMP # Enable multiple cores diff --git a/sys/arm/conf/std.armv6 b/sys/arm/conf/std.armv6 index d67b9c454c23..fce8b6e6e975 100644 --- a/sys/arm/conf/std.armv6 +++ b/sys/arm/conf/std.armv6 @@ -2,8 +2,8 @@ # # $FreeBSD$ +options HZ=1000 options ARM_L2_PIPT # Only L2 PIPT is supported - options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols