Module Name: src
Committed By: christos
Date: Thu Mar 12 19:56:51 UTC 2015
Modified Files:
src/sys/dev/ic: ciss.c
Log Message:
use hardclock_ticks; pointed out by hannken.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/ciss.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.34 src/sys/dev/ic/ciss.c:1.35
--- src/sys/dev/ic/ciss.c:1.34 Thu Mar 12 14:53:22 2015
+++ src/sys/dev/ic/ciss.c Thu Mar 12 15:56:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $ */
+/* $NetBSD: ciss.c,v 1.35 2015/03/12 19:56:51 christos Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.34 2015/03/12 18:53:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.35 2015/03/12 19:56:51 christos Exp $");
#include "bio.h"
@@ -505,7 +505,7 @@ ciss_wait(struct ciss_softc *sc, struct
tohz = mstohz(ms);
if (tohz == 0)
tohz = 1;
- etick = tick + tohz;
+ etick = hardclock_ticks + tohz;
for (;;) {
ccb->ccb_state = CISS_CCB_POLL;
@@ -521,7 +521,7 @@ ciss_wait(struct ciss_softc *sc, struct
ciss_done(ccb);
return 0;
}
- tohz = etick - tick;
+ tohz = etick - hardclock_ticks;
if (tohz <= 0)
return EWOULDBLOCK;
CISS_DPRINTF(CISS_D_CMD, ("T"));
