svn commit: r314521 - stable/11/sys/arm/conf

Ian Lepore ian at FreeBSD.org
Wed Mar 1 21:45:06 UTC 2017 

Author: ian
Date: Wed Mar  1 21:45:03 2017
New Revision: 314521
URL: https://svnweb.freebsd.org/changeset/base/314521

Log:
  MFC r302506:
  
    Remove HZ=<various> from all armv6 configs, put HZ=1000 in std.armv6.

Modified:
  stable/11/sys/arm/conf/ALLWINNER
  stable/11/sys/arm/conf/ALPINE
  stable/11/sys/arm/conf/AML8726
  stable/11/sys/arm/conf/ARMADA38X
  stable/11/sys/arm/conf/ARMADAXP
  stable/11/sys/arm/conf/BEAGLEBONE
  stable/11/sys/arm/conf/EXYNOS5.common
  stable/11/sys/arm/conf/IMX53-QSB
  stable/11/sys/arm/conf/IMX6
  stable/11/sys/arm/conf/PANDABOARD
  stable/11/sys/arm/conf/RK3188
  stable/11/sys/arm/conf/RPI-B
  stable/11/sys/arm/conf/RPI2
  stable/11/sys/arm/conf/SOCKIT.common
  stable/11/sys/arm/conf/TEGRA124
  stable/11/sys/arm/conf/VERSATILEPB
  stable/11/sys/arm/conf/VIRT
  stable/11/sys/arm/conf/VYBRID
  stable/11/sys/arm/conf/std.armv6
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/conf/ALLWINNER
==============================================================================
--- stable/11/sys/arm/conf/ALLWINNER	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/ALLWINNER	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/ALPINE
==============================================================================
--- stable/11/sys/arm/conf/ALPINE	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/ALPINE	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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
 

Modified: stable/11/sys/arm/conf/AML8726
==============================================================================
--- stable/11/sys/arm/conf/AML8726	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/AML8726	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/ARMADA38X
==============================================================================
--- stable/11/sys/arm/conf/ARMADA38X	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/ARMADA38X	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/11/sys/arm/conf/ARMADAXP	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/ARMADAXP	Wed Mar  1 21:45:03 2017	(r314521)
@@ -27,7 +27,6 @@ options 	SOC_MV_ARMADAXP
 
 makeoptions	WERROR="-Werror"
 
-options 	HZ=1000
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 

Modified: stable/11/sys/arm/conf/BEAGLEBONE
==============================================================================
--- stable/11/sys/arm/conf/BEAGLEBONE	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/BEAGLEBONE	Wed Mar  1 21:45:03 2017	(r314521)
@@ -30,7 +30,6 @@ makeoptions	MODULES_EXTRA="dtb/am335x am
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 

Modified: stable/11/sys/arm/conf/EXYNOS5.common
==============================================================================
--- stable/11/sys/arm/conf/EXYNOS5.common	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/EXYNOS5.common	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/11/sys/arm/conf/IMX53-QSB	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/IMX53-QSB	Wed Mar  1 21:45:03 2017	(r314521)
@@ -22,8 +22,6 @@
 include 	"IMX53"
 ident		IMX53-QSB
 
-options 	HZ=250			# 4ms scheduling quantum
-
 # required for netbooting
 #options 	BOOTP
 #options 	BOOTP_COMPAT

Modified: stable/11/sys/arm/conf/IMX6
==============================================================================
--- stable/11/sys/arm/conf/IMX6	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/IMX6	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/PANDABOARD
==============================================================================
--- stable/11/sys/arm/conf/PANDABOARD	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/PANDABOARD	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/RK3188
==============================================================================
--- stable/11/sys/arm/conf/RK3188	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/RK3188	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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
 

Modified: stable/11/sys/arm/conf/RPI-B
==============================================================================
--- stable/11/sys/arm/conf/RPI-B	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/RPI-B	Wed Mar  1 21:45:03 2017	(r314521)
@@ -26,7 +26,6 @@ include 	"../broadcom/bcm2835/std.bcm283
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 

Modified: stable/11/sys/arm/conf/RPI2
==============================================================================
--- stable/11/sys/arm/conf/RPI2	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/RPI2	Wed Mar  1 21:45:03 2017	(r314521)
@@ -26,7 +26,6 @@ include 	"../broadcom/bcm2835/std.bcm283
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM

Modified: stable/11/sys/arm/conf/SOCKIT.common
==============================================================================
--- stable/11/sys/arm/conf/SOCKIT.common	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/SOCKIT.common	Wed Mar  1 21:45:03 2017	(r314521)
@@ -25,7 +25,6 @@ makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	WERROR="-Werror"
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 

Modified: stable/11/sys/arm/conf/TEGRA124
==============================================================================
--- stable/11/sys/arm/conf/TEGRA124	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/TEGRA124	Wed Mar  1 21:45:03 2017	(r314521)
@@ -23,7 +23,6 @@ include 	"../nvidia/tegra124/std.tegra12
 
 ident		TEGRA124
 
-options 	HZ=100			# Scheduling quantum is 10 milliseconds.
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
 options 	PLATFORM_SMP

Modified: stable/11/sys/arm/conf/VERSATILEPB
==============================================================================
--- stable/11/sys/arm/conf/VERSATILEPB	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/VERSATILEPB	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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
 

Modified: stable/11/sys/arm/conf/VIRT
==============================================================================
--- stable/11/sys/arm/conf/VIRT	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/VIRT	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/VYBRID
==============================================================================
--- stable/11/sys/arm/conf/VYBRID	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/VYBRID	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

Modified: stable/11/sys/arm/conf/std.armv6
==============================================================================
--- stable/11/sys/arm/conf/std.armv6	Wed Mar  1 21:42:22 2017	(r314520)
+++ stable/11/sys/arm/conf/std.armv6	Wed Mar  1 21:45:03 2017	(r314521)
@@ -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

More information about the svn-src-stable mailing list