diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index ef1451cd98e0..eb0975ffaf98 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $ + * $Id: clock.c,v 1.83 1997/05/05 09:34:32 peter Exp $ */ /* @@ -829,7 +829,7 @@ resettodr() #if defined(APIC_IO) /* from icu.s: */ -extern u_int hwisrs[]; +extern u_int vec[]; extern void vec8254 __P((void)); extern void vecRTC __P((void)); extern u_int ivectors[]; @@ -894,7 +894,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vec8254; + vec[x] = (u_int)vec8254; Xintr8254 = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ mask8254 = (1 << x); register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0, @@ -933,7 +933,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vecRTC; + vec[x] = (u_int)vecRTC; XintrRTC = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ maskRTC = (1 << x); register_intr(/* irq */ x, /* XXX id */ 1, /* flags */ 0, diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index ef1451cd98e0..eb0975ffaf98 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $ + * $Id: clock.c,v 1.83 1997/05/05 09:34:32 peter Exp $ */ /* @@ -829,7 +829,7 @@ resettodr() #if defined(APIC_IO) /* from icu.s: */ -extern u_int hwisrs[]; +extern u_int vec[]; extern void vec8254 __P((void)); extern void vecRTC __P((void)); extern u_int ivectors[]; @@ -894,7 +894,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vec8254; + vec[x] = (u_int)vec8254; Xintr8254 = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ mask8254 = (1 << x); register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0, @@ -933,7 +933,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vecRTC; + vec[x] = (u_int)vecRTC; XintrRTC = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ maskRTC = (1 << x); register_intr(/* irq */ x, /* XXX id */ 1, /* flags */ 0, diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index ef1451cd98e0..eb0975ffaf98 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $ + * $Id: clock.c,v 1.83 1997/05/05 09:34:32 peter Exp $ */ /* @@ -829,7 +829,7 @@ resettodr() #if defined(APIC_IO) /* from icu.s: */ -extern u_int hwisrs[]; +extern u_int vec[]; extern void vec8254 __P((void)); extern void vecRTC __P((void)); extern u_int ivectors[]; @@ -894,7 +894,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vec8254; + vec[x] = (u_int)vec8254; Xintr8254 = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ mask8254 = (1 << x); register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0, @@ -933,7 +933,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vecRTC; + vec[x] = (u_int)vecRTC; XintrRTC = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ maskRTC = (1 << x); register_intr(/* irq */ x, /* XXX id */ 1, /* flags */ 0, diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index ef1451cd98e0..eb0975ffaf98 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.82 1997/05/04 14:25:00 peter Exp $ + * $Id: clock.c,v 1.83 1997/05/05 09:34:32 peter Exp $ */ /* @@ -829,7 +829,7 @@ resettodr() #if defined(APIC_IO) /* from icu.s: */ -extern u_int hwisrs[]; +extern u_int vec[]; extern void vec8254 __P((void)); extern void vecRTC __P((void)); extern u_int ivectors[]; @@ -894,7 +894,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vec8254; + vec[x] = (u_int)vec8254; Xintr8254 = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ mask8254 = (1 << x); register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0, @@ -933,7 +933,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vecRTC; + vec[x] = (u_int)vecRTC; XintrRTC = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ maskRTC = (1 << x); register_intr(/* irq */ x, /* XXX id */ 1, /* flags */ 0, diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s index 174fdca70385..57978a810c14 100644 --- a/sys/i386/isa/icu.s +++ b/sys/i386/isa/icu.s @@ -36,7 +36,7 @@ * * @(#)icu.s 7.2 (Berkeley) 5/21/91 * - * $Id: icu.s,v 1.30 1997/04/26 11:45:54 peter Exp $ + * $Id: icu.s,v 1.31 1997/04/28 01:08:41 fsmp Exp $ */ #include "opt_smp.h" @@ -100,12 +100,9 @@ _mask8254: _maskRTC: .long 0 - - /* this allows us to change ISA IRQ# vs APIC pin# assignments */ - .globl _hwisrs -_hwisrs: #endif /* APIC_IO */ -vec: + .globl _vec +_vec: .long vec0, vec1, vec2, vec3, vec4, vec5, vec6, vec7 .long vec8, vec9, vec10, vec11, vec12, vec13, vec14, vec15 #if defined(APIC_IO) @@ -294,7 +291,7 @@ splz_unpend: * We should change the interface so that the unit number is not * determined at config time. */ - jmp *vec(,%ecx,4) + jmp *_vec(,%ecx,4) ALIGN_TEXT splz_swi: diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index ef1451cd98e0..eb0975ffaf98 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.82 1997/05/04 14:25:00 peter Exp $ + * $Id: clock.c,v 1.83 1997/05/05 09:34:32 peter Exp $ */ /* @@ -829,7 +829,7 @@ resettodr() #if defined(APIC_IO) /* from icu.s: */ -extern u_int hwisrs[]; +extern u_int vec[]; extern void vec8254 __P((void)); extern void vecRTC __P((void)); extern u_int ivectors[]; @@ -894,7 +894,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vec8254; + vec[x] = (u_int)vec8254; Xintr8254 = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ mask8254 = (1 << x); register_intr(/* irq */ x, /* XXX id */ 0, /* flags */ 0, @@ -933,7 +933,7 @@ cpu_initclocks() } } - hwisrs[x] = (u_int)vecRTC; + vec[x] = (u_int)vecRTC; XintrRTC = (u_int)ivectors[x]; /* XXX might need Xfastintr# */ maskRTC = (1 << x); register_intr(/* irq */ x, /* XXX id */ 1, /* flags */ 0,