summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2002-11-23 02:44:14 +0000
committeroster <oster@NetBSD.org>2002-11-23 02:44:14 +0000
commit93e77ce121a761b214574fde5a4ca9a72a53c883 (patch)
treec8349fca42a1080f3a412a369e9d2651c26d57a3 /sys/dev/raidframe
parentceb8b43d54b69dd65b81f7fc0f71cfce941043bb (diff)
Nuke all (but one) of the remaining RF_UTILITY's.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_acctrace.h6
-rw-r--r--sys/dev/raidframe/rf_alloclist.h4
-rw-r--r--sys/dev/raidframe/rf_debugMem.c9
-rw-r--r--sys/dev/raidframe/rf_evenodd_dags.h4
4 files changed, 7 insertions, 16 deletions
diff --git a/sys/dev/raidframe/rf_acctrace.h b/sys/dev/raidframe/rf_acctrace.h
index e7373e6d80f..f5c3742be0a 100644
--- a/sys/dev/raidframe/rf_acctrace.h
+++ b/sys/dev/raidframe/rf_acctrace.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.h,v 1.5 2002/09/14 18:07:31 oster Exp $ */
+/* $NetBSD: rf_acctrace.h,v 1.6 2002/11/23 02:44:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -122,9 +122,9 @@ typedef struct RF_AccTotals_s {
RF_Hist_t dw_hist[RF_HIST_NUM_BUCKETS];
RF_Hist_t tot_hist[RF_HIST_NUM_BUCKETS];
} RF_AccTotals_t;
-#if RF_UTILITY == 0
+
RF_DECLARE_EXTERN_MUTEX(rf_tracing_mutex)
-#endif /* RF_UTILITY == 0 */
+
int rf_ConfigureAccessTrace(RF_ShutdownList_t ** listp);
void rf_LogTraceRec(RF_Raid_t * raid, RF_AccTraceEntry_t * rec);
diff --git a/sys/dev/raidframe/rf_alloclist.h b/sys/dev/raidframe/rf_alloclist.h
index b5bd21a703c..57efb17c6dc 100644
--- a/sys/dev/raidframe/rf_alloclist.h
+++ b/sys/dev/raidframe/rf_alloclist.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.h,v 1.5 2002/09/23 03:53:14 oster Exp $ */
+/* $NetBSD: rf_alloclist.h,v 1.6 2002/11/23 02:44:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -50,10 +50,8 @@ struct RF_AllocListElem_s {
int rf_ConfigureAllocList(RF_ShutdownList_t ** listp);
-#if RF_UTILITY == 0
void rf_real_AddToAllocList(RF_AllocListElem_t * l, void *p, int size);
void rf_FreeAllocList(RF_AllocListElem_t * l);
RF_AllocListElem_t *rf_real_MakeAllocList(void);
-#endif /* RF_UTILITY == 0 */
#endif /* !_RF__RF_ALLOCLIST_H_ */
diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c
index f3f3383f863..858146df6e7 100644
--- a/sys/dev/raidframe/rf_debugMem.c
+++ b/sys/dev/raidframe/rf_debugMem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugMem.c,v 1.11 2002/09/16 23:40:57 oster Exp $ */
+/* $NetBSD: rf_debugMem.c,v 1.12 2002/11/23 02:44:15 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -29,15 +29,10 @@
/* debugMem.c: memory usage debugging stuff.
* Malloc, Calloc, and Free are #defined everywhere
* to do_malloc, do_calloc, and do_free.
- *
- * if RF_UTILITY is nonzero, it means were compiling one of the
- * raidframe utility programs, such as rfctrl or smd. In this
- * case, we eliminate all references to the threads package
- * and to the allocation list stuff.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.11 2002/09/16 23:40:57 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.12 2002/11/23 02:44:15 oster Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_evenodd_dags.h b/sys/dev/raidframe/rf_evenodd_dags.h
index 9889b03c24e..2fd31439e97 100644
--- a/sys/dev/raidframe/rf_evenodd_dags.h
+++ b/sys/dev/raidframe/rf_evenodd_dags.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd_dags.h,v 1.3 2001/10/04 15:58:53 oster Exp $ */
+/* $NetBSD: rf_evenodd_dags.h,v 1.4 2002/11/23 02:44:14 oster Exp $ */
/*
* rf_evenodd_dags.h
*/
@@ -34,7 +34,6 @@
#include <dev/raidframe/raidframevar.h>
-#if RF_UTILITY == 0
#include "rf_dag.h"
/* extern decl's of the failure mode EO functions.
@@ -58,6 +57,5 @@ RF_CREATE_DAG_FUNC_DECL(rf_EO_DoubleDegRead);
RF_CREATE_DAG_FUNC_DECL(rf_EOCreateSmallWriteDAG);
RF_CREATE_DAG_FUNC_DECL(rf_EOCreateLargeWriteDAG);
RF_CREATE_DAG_FUNC_DECL(rf_EO_200_CreateWriteDAG);
-#endif /* RF_UTILITY == 0 */
#endif /* !_RF__RF_EVENODD_DAGS_H_ */