summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>1999-12-07 02:13:28 +0000
committeroster <oster@NetBSD.org>1999-12-07 02:13:28 +0000
commita38b721e5fdd83a8dbdf0acf9a1102b2a4b98405 (patch)
tree82a7a3241b818730cca48a966e5f587f20627c3e /sys/dev/raidframe
parent837589f349eb6b5b285e88d6f53d3f9768302ea0 (diff)
Nuke the last few bits of RF_DEBUG_ATOMIC that should have
disappeared a while back.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_driver.c9
-rw-r--r--sys/dev/raidframe/rf_threadstuff.c18
2 files changed, 2 insertions, 25 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 8e925c730e1..61e711ce90a 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.16 1999/12/03 03:18:45 oster Exp $ */
+/* $NetBSD: rf_driver.c,v 1.17 1999/12/07 02:13:28 oster Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -201,10 +201,6 @@ rf_BootRaidframe()
return (EBUSY);
raidframe_booted = 1;
-#if RF_DEBUG_ATOMIC > 0
- rf_atent_init();
-#endif /* RF_DEBUG_ATOMIC > 0 */
-
rf_setup_threadid();
rf_assign_threadid();
@@ -243,9 +239,6 @@ rf_UnbootRaidframe()
__LINE__, rc);
RF_PANIC();
}
-#if RF_DEBUG_ATOMIC > 0
- rf_atent_shutdown();
-#endif /* RF_DEBUG_ATOMIC > 0 */
return (0);
}
/*
diff --git a/sys/dev/raidframe/rf_threadstuff.c b/sys/dev/raidframe/rf_threadstuff.c
index 63f6c78ae57..a86671c47c8 100644
--- a/sys/dev/raidframe/rf_threadstuff.c
+++ b/sys/dev/raidframe/rf_threadstuff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.c,v 1.4 1999/09/08 02:01:55 oster Exp $ */
+/* $NetBSD: rf_threadstuff.c,v 1.5 1999/12/07 02:13:28 oster Exp $ */
/*
* rf_threadstuff.c
*/
@@ -138,13 +138,8 @@ _rf_destroy_threadgroup(g, file, line)
{
int rc1, rc2;
-#if RF_DEBUG_ATOMIC > 0
- rc1 = _rf_mutex_destroy(&g->mutex, file, line);
- rc2 = _rf_cond_destroy(&g->cond, file, line);
-#else /* RF_DEBUG_ATOMIC > 0 */
rc1 = rf_mutex_destroy(&g->mutex);
rc2 = rf_cond_destroy(&g->cond);
-#endif /* RF_DEBUG_ATOMIC > 0 */
if (rc1)
return (rc1);
return (rc2);
@@ -158,16 +153,6 @@ _rf_init_threadgroup(g, file, line)
{
int rc;
-#if RF_DEBUG_ATOMIC > 0
- rc = _rf_mutex_init(&g->mutex, file, line);
- if (rc)
- return (rc);
- rc = _rf_cond_init(&g->cond, file, line);
- if (rc) {
- _rf_mutex_destroy(&g->mutex, file, line);
- return (rc);
- }
-#else /* RF_DEBUG_ATOMIC > 0 */
rc = rf_mutex_init(&g->mutex);
if (rc)
return (rc);
@@ -176,7 +161,6 @@ _rf_init_threadgroup(g, file, line)
rf_mutex_destroy(&g->mutex);
return (rc);
}
-#endif /* RF_DEBUG_ATOMIC > 0 */
g->created = g->running = g->shutdown = 0;
return (0);
}