Module Name: src
Committed By: pooka
Date: Tue Apr 21 16:18:50 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: intr.c
Log Message:
Use hardclock_ticks instead of a homegrown variable.
... not that I understand how various kernel algorithms can work
after enough uptime with hardclock_ticks being a signed int.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/rump/librump/rumpkern/intr.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/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.49 src/sys/rump/librump/rumpkern/intr.c:1.50
--- src/sys/rump/librump/rumpkern/intr.c:1.49 Thu Apr 16 10:08:59 2015
+++ src/sys/rump/librump/rumpkern/intr.c Tue Apr 21 16:18:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.49 2015/04/16 10:08:59 pooka Exp $ */
+/* $NetBSD: intr.c,v 1.50 2015/04/21 16:18:50 pooka Exp $ */
/*
* Copyright (c) 2008-2010, 2015 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.49 2015/04/16 10:08:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.50 2015/04/21 16:18:50 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -80,7 +80,6 @@ static struct rumpuser_cv *sicpucv;
kcondvar_t lbolt; /* Oh Kath Ra */
-static u_int ticks;
static int ncpu_final;
static u_int
@@ -88,7 +87,7 @@ rumptc_get(struct timecounter *tc)
{
KASSERT(rump_threads);
- return ticks;
+ return (u_int)hardclock_ticks;
}
static struct timecounter rumptc = {
@@ -132,7 +131,7 @@ doclock(void *noarg)
if (cpuindx != 0)
continue;
- if ((++ticks % hz) == 0) {
+ if ((++hardclock_ticks % hz) == 0) {
cv_broadcast(&lbolt);
}
tc_ticktock();
