diff options
| author | bde <bde@FreeBSD.org> | 2000-05-31 13:32:28 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-05-31 13:32:28 +0000 |
| commit | 2e4d43a8f4885efc445df4ef9e726f6dbc043e5f (patch) | |
| tree | 3993d930cab72e02360484fcad42a623a9d54fcf /sys/amd64/isa | |
| parent | 3b7e236de2f9883b0ae23d1825e6e352f9cd9e27 (diff) | |
| download | FreeBSD-src-2e4d43a8f4885efc445df4ef9e726f6dbc043e5f.zip FreeBSD-src-2e4d43a8f4885efc445df4ef9e726f6dbc043e5f.tar.gz | |
Add SWI_TQ_MASK to all interrupt masks except SWI_CLOCK_MASK. Use a
new macro SWI_LOW_MASK to give the mask for low priority SWIs instead
of hard-coding this mask as SWI_CLOCK_MASK.
Reviewed by: dfr
Diffstat (limited to 'sys/amd64/isa')
| -rw-r--r-- | sys/amd64/isa/clock.c | 2 | ||||
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 4 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 4 | ||||
| -rw-r--r-- | sys/amd64/isa/npx.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 871724c..465ea98 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -134,7 +134,7 @@ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ volatile u_int idelayed; int statclock_disable; -u_int stat_imask = SWI_CLOCK_MASK; +u_int stat_imask = SWI_LOW_MASK; #ifndef TIMER_FREQ #define TIMER_FREQ 1193182 #endif diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index f9eb11b..9c3ce45 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -340,7 +340,7 @@ update_intr_masks(void) maskptr = intr_mptr[intr]; if (!maskptr) continue; - *maskptr |= SWI_CLOCK_MASK | (1 << intr); + *maskptr |= SWI_LOW_MASK | (1 << intr); mask = *maskptr; if (mask != intr_mask[intr]) { #if 0 @@ -427,7 +427,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags) disable_intr(); intr_handler[intr] = handler; intr_mptr[intr] = maskptr; - intr_mask[intr] = mask | SWI_CLOCK_MASK | (1 << intr); + intr_mask[intr] = mask | SWI_LOW_MASK | (1 << intr); intr_unit[intr] = arg; #ifdef FAST_HI if (flags & INTR_FAST) { diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index f9eb11b..9c3ce45 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -340,7 +340,7 @@ update_intr_masks(void) maskptr = intr_mptr[intr]; if (!maskptr) continue; - *maskptr |= SWI_CLOCK_MASK | (1 << intr); + *maskptr |= SWI_LOW_MASK | (1 << intr); mask = *maskptr; if (mask != intr_mask[intr]) { #if 0 @@ -427,7 +427,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags) disable_intr(); intr_handler[intr] = handler; intr_mptr[intr] = maskptr; - intr_mask[intr] = mask | SWI_CLOCK_MASK | (1 << intr); + intr_mask[intr] = mask | SWI_LOW_MASK | (1 << intr); intr_unit[intr] = arg; #ifdef FAST_HI if (flags & INTR_FAST) { diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 5c8edca..20cd19e 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -136,7 +136,7 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, "Floatingpoint instructions executed in hardware"); #ifndef SMP -static u_int npx0_imask = SWI_CLOCK_MASK; +static u_int npx0_imask = SWI_LOW_MASK; static struct gate_descriptor npx_idt_probeintr; static int npx_intrno; static volatile u_int npx_intrs_while_probing; |
