diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-07-05 17:11:08 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-07-05 17:11:08 +0000 |
| commit | 4dfc91bbef932df5e9fa91333245d21bb446cfec (patch) | |
| tree | 002654ca18164f7d5f25eea672173e94a4878949 /sys/arch/amd64/isa/clock.c | |
| parent | 81a7cc32287764010bc77b512fb037b27a8ae362 (diff) | |
N: Thou shalt not call hardclock() with biglock held.
i386 disobeys the Nth commandment. Fix this. While here, make i386 and amd64
definitions of iplclock and statclock match.
ok art@, kettenis@
Diffstat (limited to 'sys/arch/amd64/isa/clock.c')
| -rw-r--r-- | sys/arch/amd64/isa/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c index 44ba26233b9..7a6aa095b97 100644 --- a/sys/arch/amd64/isa/clock.c +++ b/sys/arch/amd64/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.18 2011/04/08 08:55:01 jsg Exp $ */ +/* $OpenBSD: clock.c,v 1.19 2011/07/05 17:11:07 oga Exp $ */ /* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -315,7 +315,7 @@ i8254_initclocks(void) isa_intr_establish(NULL, 0, IST_PULSE, IPL_CLOCK, clockintr, 0, "clock"); - isa_intr_establish(NULL, 8, IST_PULSE, IPL_CLOCK, rtcintr, + isa_intr_establish(NULL, 8, IST_PULSE, IPL_STATCLOCK, rtcintr, 0, "rtc"); rtcstart(); /* start the mc146818 clock */ |