diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-01-04 10:35:33 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-01-04 10:35:33 +0000 |
| commit | 7d094989fd064251024c710a29702c7ab8292c0a (patch) | |
| tree | 5ce0d3fb349a5b818870904d2c4fcae7828ba940 /sys | |
| parent | 86523a96c953476bb61cd0ca6209a796c7eb9c59 (diff) | |
reset cold at the end of cpu_configure(), add a comment when fooling w/ itmr
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/hppa/autoconf.c | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/intr.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c index 06b0cb64c6c..7ebb6db97b3 100644 --- a/sys/arch/hppa/hppa/autoconf.c +++ b/sys/arch/hppa/hppa/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.25 2002/12/18 23:52:45 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.26 2003/01/04 10:35:32 mickey Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -108,6 +108,7 @@ cpu_configure() timeout_set(&heartbeat_tmo, heartbeat, NULL); heartbeat(NULL); #endif + cold = 0; } #ifdef USELEDS diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c index c9b1de4ecb1..4edd36ef623 100644 --- a/sys/arch/hppa/hppa/intr.c +++ b/sys/arch/hppa/hppa/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.5 2002/12/17 22:05:47 mickey Exp $ */ +/* $OpenBSD: intr.c,v 1.6 2003/01/04 10:35:32 mickey Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -140,12 +140,10 @@ cpu_intr_init() /* XXX the whacky trick is to prevent hardclock from happenning */ mfctl(CR_ITMR, mask); mtctl(mask - 1, CR_ITMR); - + /* ack the unwanted clock interrupt */ mtctl(cpu_mask, CR_EIEM); mtctl((1 << 31), CR_EIRR); - cold = 0; - /* in spl*() we trust, clock is started in initclocks() */ kpsw |= PSL_I; __asm __volatile("ssm %0, %%r0" :: "i" (PSL_I)); |