diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 20:59:25 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-22 20:59:25 +0000 |
| commit | 00285ca9c92e870c613623812c3b229a9d3ae148 (patch) | |
| tree | 4883d3b622fa3a6634f1120e2b78f5319f99878f /sys/arch/mips64 | |
| parent | 948414d0135e4c47beaa234fba2e77dc62b04dd9 (diff) | |
With the splx() changes, it is no longer necessary to remember which interrupt
sources were masked and saved in ci_ipending, as splx() will unmask what needs
to be unmasked anyway. ci_ipending only now needs to store pending soft
interrupts, so rename it to ci_softpending.
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/softintr.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 119b428aa1d..ad44f2270a2 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.39 2009/10/22 20:05:26 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.40 2009/10/22 20:59:22 miod Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -375,7 +375,7 @@ struct cpu_info { cpuid_t ci_cpuid; /* our CPU ID */ uint32_t ci_randseed; /* per cpu random seed */ uint32_t ci_cpl; - uint32_t ci_ipending; + uint32_t ci_softpending; /* pending soft interrupts */ #ifdef MULTIPROCESSOR u_long ci_flags; /* flags; see below */ #endif diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index e7c6491383d..aa94dd46b3b 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.47 2009/10/22 20:39:16 miod Exp $ */ +/* $OpenBSD: interrupt.c,v 1.48 2009/10/22 20:59:24 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -164,7 +164,7 @@ interrupt(struct trap_frame *trapframe) #endif xcpl = splsoft(); - if ((ci->ci_ipending & SINT_ALLMASK) & ~xcpl) { + if (ci->ci_softpending & ~xcpl) { dosoftint(xcpl); } diff --git a/sys/arch/mips64/mips64/softintr.c b/sys/arch/mips64/mips64/softintr.c index 764df17a3ed..748657f0ccd 100644 --- a/sys/arch/mips64/mips64/softintr.c +++ b/sys/arch/mips64/mips64/softintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softintr.c,v 1.3 2009/10/22 20:05:27 miod Exp $ */ +/* $OpenBSD: softintr.c,v 1.4 2009/10/22 20:59:24 miod Exp $ */ /* $NetBSD: softintr.c,v 1.2 2003/07/15 00:24:39 lukem Exp $ */ /* @@ -175,7 +175,7 @@ softintr_schedule(void *arg) if (sih->sih_pending == 0) { TAILQ_INSERT_TAIL(&siq->siq_list, sih, sih_list); sih->sih_pending = 1; - atomic_setbits_int(&ci->ci_ipending, SINTMASK(siq->siq_si)); + atomic_setbits_int(&ci->ci_softpending, SINTMASK(siq->siq_si)); } mtx_leave(&siq->siq_mtx); } @@ -205,8 +205,8 @@ dosoftint(uint32_t xcpl) struct cpu_info *ci = curcpu(); int sir, q, mask; - while ((sir = (ci->ci_ipending & SINT_ALLMASK & ~xcpl)) != 0) { - atomic_clearbits_int(&ci->ci_ipending, sir); + while ((sir = (ci->ci_softpending & ~xcpl)) != 0) { + atomic_clearbits_int(&ci->ci_softpending, sir); for (q = SI_NQUEUES - 1; q >= 0; q--) { mask = SINTMASK(q); |