Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke dependencies on rf_cpuutils.h.

This commit is contained in:
oster 2000-01-09 03:14:32 +00:00
parent e5b5b86865
commit 4a54cff7d7
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/raidframe/rf_driver.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_driver.c,v 1.24 2000/01/09 01:29:28 oster Exp $ */
/* $NetBSD: rf_driver.c,v 1.25 2000/01/09 03:14:32 oster Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@ -114,7 +114,6 @@
#include "rf_driver.h"
#include "rf_options.h"
#include "rf_shutdown.h"
#include "rf_cpuutil.h"
#include "rf_kintf.h"
#include <sys/buf.h>
@ -424,7 +423,6 @@ rf_Configure(raidPtr, cfgPtr)
DO_INIT_CONFIGURE(rf_ConfigureReconstruction);
DO_INIT_CONFIGURE(rf_ConfigureCopyback);
DO_INIT_CONFIGURE(rf_ConfigureDiskQueueSystem);
DO_INIT_CONFIGURE(rf_ConfigureCpuMonitor);
isconfigged = 1;
}
RF_UNLOCK_MUTEX(configureMutex);

11
sys/dev/raidframe/rf_reconstruct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_reconstruct.c,v 1.13 2000/01/09 01:45:58 oster Exp $ */
/* $NetBSD: rf_reconstruct.c,v 1.14 2000/01/09 03:14:33 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -59,7 +59,6 @@
#include "rf_debugprint.h"
#include "rf_driver.h"
#include "rf_utils.h"
#include "rf_cpuutil.h"
#include "rf_shutdown.h"
#include "rf_kintf.h"
@ -667,7 +666,7 @@ rf_ContinueReconstructFailedDisk(reconDesc)
/* now start up the actual reconstruction: issue a read for
* each surviving disk */
rf_start_cpu_monitor();
reconDesc->numDisksDone = 0;
for (i = 0; i < raidPtr->numCol; i++) {
if (i != col) {
@ -735,15 +734,11 @@ rf_ContinueReconstructFailedDisk(reconDesc)
reconDesc->state = 5;
case 5:
rf_stop_cpu_monitor();
/* Success: mark the dead disk as reconstructed. We quiesce
* the array here to assure no nasty interactions with pending
* user accesses when we free up the psstatus structure as
* part of FreeReconControl() */
reconDesc->state = 6;
retcode = rf_SuspendNewRequestsAndWait(raidPtr);
@ -784,7 +779,7 @@ rf_ContinueReconstructFailedDisk(reconDesc)
(int) raidPtr->reconControl[row]->starttime.tv_sec,
(int) raidPtr->reconControl[row]->starttime.tv_usec,
(int) etime.tv_sec, (int) etime.tv_usec);
rf_print_cpu_util("reconstruction");
#if RF_RECON_STATS > 0
printf("Total head-sep stall count was %d\n",
(int) reconDesc->hsStallCount);