summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrucec <brucec@FreeBSD.org>2010-02-08 20:57:42 +0000
committerbrucec <brucec@FreeBSD.org>2010-02-08 20:57:42 +0000
commitac84487156119449bfafd9c5ef0a27dd6881aab0 (patch)
tree8b3777eaddd5ce3a851f1cd3758a772d88cf9c86
parent238dae6d52e9e3738da923cdb4364ceaf2ab10f9 (diff)
downloadFreeBSD-src-ac84487156119449bfafd9c5ef0a27dd6881aab0.zip
FreeBSD-src-ac84487156119449bfafd9c5ef0a27dd6881aab0.tar.gz
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)
-rw-r--r--sys/conf/NOTES9
-rw-r--r--sys/dev/aic7xxx/aic79xx_osm.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 8dc74f2..4d7c596f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -386,6 +386,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.
@@ -2596,8 +2601,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
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 81eade6..375de63 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -83,11 +83,13 @@ static const char *ahd_sysctl_node_elements[] = {
"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_elements[] = {
"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)
OpenPOWER on IntegriCloud