summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/clock.c
diff options
context:
space:
mode:
authortegge <tegge@FreeBSD.org>1998-03-05 21:45:53 +0000
committertegge <tegge@FreeBSD.org>1998-03-05 21:45:53 +0000
commiteaaa0673642405f47344a4c03b0f6f599130e963 (patch)
tree94f74ab3df8e4fe45934f04bd6094bdffca0b608 /sys/i386/isa/clock.c
parent3705591ee2750bfa0500fab05f978a75561afcd7 (diff)
downloadFreeBSD-src-eaaa0673642405f47344a4c03b0f6f599130e963.zip
FreeBSD-src-eaaa0673642405f47344a4c03b0f6f599130e963.tar.gz
Remove special handling for resuming clock interrupt when using APIC_IO.
The `generic' vector stubs do the right thing.
Diffstat (limited to 'sys/i386/isa/clock.c')
-rw-r--r--sys/i386/isa/clock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 4388c97..3236103 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.113 1998/02/23 00:11:25 bde Exp $
+ * $Id: clock.c,v 1.114 1998/02/28 21:16:13 phk Exp $
*/
/*
@@ -87,6 +87,9 @@
#ifdef SMP
#define disable_intr() CLOCK_DISABLE_INTR()
#define enable_intr() CLOCK_ENABLE_INTR()
+
+/* The interrupt triggered by the 8254 (timer) chip */
+int apic_8254_intr;
#endif /* SMP */
/*
@@ -949,15 +952,12 @@ cpu_initclocks()
else
panic("neither pin 0 or pin 2 works for 8254");
- /* setup the vectors */
- vec[x] = (u_int)vec8254;
- Xintr8254 = (u_int)ivectors[x];
- mask8254 = (1 << x);
+ apic_8254_intr = x;
register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0,
/* XXX */ (inthand2_t *)clkintr, &clk_imask,
/* unit */ 0);
- INTREN(mask8254);
+ INTREN(1 << x);
#else /* APIC_IO */
OpenPOWER on IntegriCloud