Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Feb 2010 11:07:36 +0000 (UTC)
From:      Bruce Cran <brucec@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r204039 - in stable/8/sys: conf dev/aic7xxx
Message-ID:  <201002181107.o1IB7aG8045573@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brucec
Date: Thu Feb 18 11:07:36 2010
New Revision: 204039
URL: http://svn.freebsd.org/changeset/base/204039

Log:
  MFC r203685:
  
  Document the usfs driver and the NO_SYSCTL_DESCR option, and update the comment
  for umass.
  Don't include the sysctl description variables in aic7xxx when NO_SYSCTL_DESCR
  is used.
  
  Approved by:	rrs (mentor)

Modified:
  stable/8/sys/conf/NOTES
  stable/8/sys/dev/aic7xxx/aic79xx_osm.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/conf/NOTES
==============================================================================
--- stable/8/sys/conf/NOTES	Thu Feb 18 11:03:35 2010	(r204038)
+++ stable/8/sys/conf/NOTES	Thu Feb 18 11:07:36 2010	(r204039)
@@ -377,6 +377,11 @@ options 	KDTRACE_HOOKS
 options 	SYSCTL_DEBUG
 
 #
+# NO_SYSCTL_DESCR omits the sysctl node descriptions to save space in the
+# resulting kernel.
+options		NO_SYSCTL_DESCR
+
+#
 # DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
 # for the kernel used to detect modify-after-free scenarios.  See the
 # memguard(9) man page for more information on usage.
@@ -2529,8 +2534,10 @@ device		uhid
 device		ukbd
 # USB printer
 device		ulpt
-# USB Iomega Zip 100 Drive (Requires scbus and da)
+# USB mass storage driver (Requires scbus and da)
 device		umass
+# USB mass storage driver for device-side mode
+device		usfs
 # USB support for Belkin F5U109 and Magic Control Technology serial adapters
 device		umct
 # USB modem support

Modified: stable/8/sys/dev/aic7xxx/aic79xx_osm.c
==============================================================================
--- stable/8/sys/dev/aic7xxx/aic79xx_osm.c	Thu Feb 18 11:03:35 2010	(r204038)
+++ stable/8/sys/dev/aic7xxx/aic79xx_osm.c	Thu Feb 18 11:07:36 2010	(r204039)
@@ -83,11 +83,13 @@ static const char *ahd_sysctl_node_eleme
 	"debug"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_node_descriptions[] = {
 	"root error collection for aic79xx controllers",
 	"summary collection for aic79xx controllers",
 	"debug collection for aic79xx controllers"
 };
+#endif
 
 static const char *ahd_sysctl_errors_elements[] = {
 	"Cerrors",
@@ -95,11 +97,13 @@ static const char *ahd_sysctl_errors_ele
 	"Ferrors"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_errors_descriptions[] = {
 	"Correctable errors",
 	"Uncorrectable errors",
 	"Fatal errors"
 };
+#endif
 
 static int
 ahd_set_debugcounters(SYSCTL_HANDLER_ARGS)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002181107.o1IB7aG8045573>