From 86237742e7e24065990c5655d40c2ded9274709b Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 1 Mar 2017 21:45:03 +0000 Subject: MFC r302506: Remove HZ= from all armv6 configs, put HZ=1000 in std.armv6. --- sys/arm/conf/ALLWINNER | 1 - sys/arm/conf/ALPINE | 1 - sys/arm/conf/AML8726 | 1 - sys/arm/conf/ARMADA38X | 2 -- sys/arm/conf/ARMADAXP | 1 - sys/arm/conf/BEAGLEBONE | 1 - sys/arm/conf/EXYNOS5.common | 1 - sys/arm/conf/IMX53-QSB | 2 -- sys/arm/conf/IMX6 | 1 - sys/arm/conf/PANDABOARD | 1 - sys/arm/conf/RK3188 | 1 - sys/arm/conf/RPI-B | 1 - sys/arm/conf/RPI2 | 1 - sys/arm/conf/SOCKIT.common | 1 - sys/arm/conf/TEGRA124 | 1 - sys/arm/conf/VERSATILEPB | 1 - sys/arm/conf/VIRT | 3 +-- sys/arm/conf/VYBRID | 1 - sys/arm/conf/std.armv6 | 2 +- 19 files changed, 2 insertions(+), 22 deletions(-) (limited to 'sys/arm') diff --git a/sys/arm/conf/ALLWINNER b/sys/arm/conf/ALLWINNER index b3258e5..ae7e416 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 4160f95..64a9f6a 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 a90cccf..e41c05a 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 3176a81..aa5f23d 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 5e107dd..19a11ea 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 2fbe219..8010aee 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 ad42056..b5102dd 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 5fa907c..8d25ea6 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 6000566..f834033 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 158a9b7..b98c4b0 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 7528c0c..7f77159 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 5e8aee2..ce408ab 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 82293ad..b2dc8f1 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 964c98a..9102002 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 663a948..34e8409 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 63feaff..7cfc5f6 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 007e24c..ad266c7 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 d834b55..2174aee 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 3a6d5c8..37637ef 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 -- cgit v1.1