svn commit: r248055 - in head: . sys/sparc64/conf

[Marius Strobl]

Author: marius
Date: Fri Mar  8 13:11:45 2013
New Revision: 248055
URL: http://svnweb.freebsd.org/changeset/base/248055

Log:
  Merge r247814 from x86 modulo whitespace bug:
  
  Turn on the CTL disable tunable by default.
  
  This will allow GENERIC configurations to boot on small memory boxes, but
  not require end users who want to use CTL to recompile their kernel.  They
  can simply set kern.cam.ctl.disable=0 in loader.conf.

Modified:
  head/UPDATING
  head/sys/sparc64/conf/GENERIC

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Mar  8 12:59:06 2013	(r248054)
+++ head/UPDATING	Fri Mar  8 13:11:45 2013	(r248055)
@@ -26,6 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130308:
+	CTL_DISABLE has also been added to the sparc64 GENERIC (for further
+	information, see the respective 20130304 entry).
+
 20130304:
 	Recent commits to callout(9) changed the size of struct callout,
 	so the KBI is probably heavily disturbed. Also, some functions

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC	Fri Mar  8 12:59:06 2013	(r248054)
+++ head/sys/sparc64/conf/GENERIC	Fri Mar  8 13:11:45 2013	(r248055)
@@ -122,6 +122,9 @@ device		cd		# CD
 device		pass		# Passthrough device (direct ATA/SCSI access)
 device		ses		# Enclosure Services (SES and SAF-TE)
 device		ctl		# CAM Target Layer
+options 	CTL_DISABLE	# Disable CTL by default to save memory.
+				# Re-enable with kern.cam.ctl.disable=0 in
+				# /boot/loader.conf
 
 # RAID controllers
 #device		amr		# AMI MegaRAID