From 5f30e9f144548ef5d2a3dd7f42b0ffad17a97b48 Mon Sep 17 00:00:00 2001 From: marius Date: Fri, 8 Mar 2013 13:11:45 +0000 Subject: [PATCH] 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. --- UPDATING | 4 ++++ sys/sparc64/conf/GENERIC | 3 +++ 2 files changed, 7 insertions(+) diff --git a/UPDATING b/UPDATING index 99af0ed243b4..013a1a085628 100644 --- a/UPDATING +++ b/UPDATING @@ -26,6 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: 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 diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 79124abc4109..e19f17cc03ef 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -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