diff options
| author | bde <bde@FreeBSD.org> | 1998-09-20 19:56:28 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-09-20 19:56:28 +0000 |
| commit | 449f0bccf805179d228838fd86a2b3c4eb6fb3dd (patch) | |
| tree | 4b53a7308d99008fed48c029ec2c5cff56982e7c /sys/i386/isa/clock.c | |
| parent | 10a29b9e349163e691c0b1498a9dbe5c18fb9f09 (diff) | |
| download | FreeBSD-src-449f0bccf805179d228838fd86a2b3c4eb6fb3dd.zip FreeBSD-src-449f0bccf805179d228838fd86a2b3c4eb6fb3dd.tar.gz | |
Attempt to work around a bug in the previous commit related to
non-reentrancy of SMP clock locking. Depend on the giant lock
protecting clkintr().
Diffstat (limited to 'sys/i386/isa/clock.c')
| -rw-r--r-- | sys/i386/isa/clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 667a52e..7515141 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.125 1998/09/06 22:41:41 tegge Exp $ + * $Id: clock.c,v 1.126 1998/09/20 03:47:54 bde Exp $ */ /* @@ -208,7 +208,7 @@ clkintr(struct clockframe frame) * hardware counter must be read to ensure monotonicity * despite multiple rollovers and misbehaving hardware. */ - disable_intr(); + (disable_intr)(); /* XXX avoid clock locking */ if (i8254_ticked) { i8254_get_timecount(NULL); i8254_ticked = 0; @@ -216,7 +216,7 @@ clkintr(struct clockframe frame) i8254_offset += timer0_max_count; i8254_lastcount = 0; } - enable_intr(); + (enable_intr)(); /* XXX avoid clock locking */ } timer_func(&frame); switch (timer0_state) { |
