svn commit: r278677 - stable/10/sys/arm/conf

[Ian Lepore]

Author: ian
Date: Fri Feb 13 15:32:31 2015
New Revision: 278677
URL: https://svnweb.freebsd.org/changeset/base/278677

Log:
  MFC r276642, r276644:
  
    Remove commented-out options SMP and APIC_IO from old arm boards that will
    never be able to support smp.
  
    Switch all arm kernels with option SMP to use SCHED_ULE instead of 4BSD.

Modified:
  stable/10/sys/arm/conf/ARMADAXP
  stable/10/sys/arm/conf/CRB
  stable/10/sys/arm/conf/CUBIEBOARD2
  stable/10/sys/arm/conf/EP80219
  stable/10/sys/arm/conf/EXYNOS5.common
  stable/10/sys/arm/conf/IQ31244
  stable/10/sys/arm/conf/PANDABOARD
  stable/10/sys/arm/conf/ZEDBOARD
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/conf/ARMADAXP
==============================================================================
--- stable/10/sys/arm/conf/ARMADAXP	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/ARMADAXP	Fri Feb 13 15:32:31 2015	(r278677)
@@ -14,7 +14,7 @@ makeoptions	DEBUG=-g		# Build kernel wit
 makeoptions	WERROR="-Werror"
 
 #options 	SCHED_ULE		# ULE scheduler
-options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	FFS			# Berkeley Fast Filesystem

Modified: stable/10/sys/arm/conf/CRB
==============================================================================
--- stable/10/sys/arm/conf/CRB	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/CRB	Fri Feb 13 15:32:31 2015	(r278677)
@@ -101,9 +101,6 @@ options 	DDB			# Enable the kernel debug
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# To make an SMP kernel, the next two are needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
-#options 	APIC_IO			# Symmetric (APIC) I/O
 options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 device		md
 device		random			# Entropy device

Modified: stable/10/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD2	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/CUBIEBOARD2	Fri Feb 13 15:32:31 2015	(r278677)
@@ -26,7 +26,7 @@ makeoptions	MODULES_OVERRIDE=""
 makeoptions	WITHOUT_MODULES="ahc"
 
 options 	HZ=100
-options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	GEOM_PART_BSD		# BSD partition scheme

Modified: stable/10/sys/arm/conf/EP80219
==============================================================================
--- stable/10/sys/arm/conf/EP80219	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/EP80219	Fri Feb 13 15:32:31 2015	(r278677)
@@ -97,9 +97,6 @@ options 	DDB			# Enable the kernel debug
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# To make an SMP kernel, the next two are needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
-#options 	APIC_IO			# Symmetric (APIC) I/O
 options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 device		md
 device		random          	# Entropy device

Modified: stable/10/sys/arm/conf/EXYNOS5.common
==============================================================================
--- stable/10/sys/arm/conf/EXYNOS5.common	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/EXYNOS5.common	Fri Feb 13 15:32:31 2015	(r278677)
@@ -24,7 +24,7 @@ makeoptions	DEBUG=-g		# Build kernel wit
 makeoptions	WERROR="-Werror"
 
 options 	HZ=100
-options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	GEOM_PART_BSD		# BSD partition scheme

Modified: stable/10/sys/arm/conf/IQ31244
==============================================================================
--- stable/10/sys/arm/conf/IQ31244	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/IQ31244	Fri Feb 13 15:32:31 2015	(r278677)
@@ -102,9 +102,6 @@ options 	DDB			# Enable the kernel debug
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# To make an SMP kernel, the next two are needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
-#options 	APIC_IO			# Symmetric (APIC) I/O
 options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
 device		md
 device		random			# Entropy device

Modified: stable/10/sys/arm/conf/PANDABOARD
==============================================================================
--- stable/10/sys/arm/conf/PANDABOARD	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/PANDABOARD	Fri Feb 13 15:32:31 2015	(r278677)
@@ -33,7 +33,7 @@ makeoptions	MODULES_OVERRIDE=""
 makeoptions WITHOUT_MODULES="ahc"
 
 options 	HZ=100
-options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	FFS			# Berkeley Fast Filesystem

Modified: stable/10/sys/arm/conf/ZEDBOARD
==============================================================================
--- stable/10/sys/arm/conf/ZEDBOARD	Fri Feb 13 15:27:46 2015	(r278676)
+++ stable/10/sys/arm/conf/ZEDBOARD	Fri Feb 13 15:32:31 2015	(r278677)
@@ -25,7 +25,7 @@ include "../xilinx/zedboard/std.zedboard
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	WITHOUT_MODULES="ahc"
 
-options 	SCHED_4BSD		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	FFS			# Berkeley Fast Filesystem