diff options
| -rw-r--r-- | sys/arch/mips64/include/cpu.h | 6 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h index 165d9cd9bbc..0f63ecdf3c4 100644 --- a/sys/arch/mips64/include/cpu.h +++ b/sys/arch/mips64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.149 2024/08/23 19:47:13 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.150 2024/10/23 07:40:20 mpi Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -187,7 +187,7 @@ struct cpu_info { ci_queue; struct pmap *ci_curpmap; - uint ci_intrdepth; /* interrupt depth */ + uint ci_idepth; /* interrupt depth */ #ifdef MULTIPROCESSOR volatile u_long ci_flags; /* flags; see below */ #endif @@ -281,7 +281,7 @@ unsigned int cpu_rnd_messybits(void); #define SR_KSU_USER 0x00000010 #define CLKF_USERMODE(framep) ((framep)->sr & SR_KSU_USER) #define CLKF_PC(framep) ((framep)->pc) -#define CLKF_INTR(framep) (curcpu()->ci_intrdepth > 1) /* XXX */ +#define CLKF_INTR(framep) (curcpu()->ci_idepth > 1) /* XXX */ /* * This is used during profiling to integrate system time. diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index 56790da6a98..bab2662adcd 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.74 2021/04/29 12:49:19 visa Exp $ */ +/* $OpenBSD: interrupt.c,v 1.75 2024/10/23 07:40:20 mpi Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -113,7 +113,7 @@ interrupt(struct trapframe *trapframe) if (!(trapframe->sr & SR_INT_ENAB)) return; - ci->ci_intrdepth++; + ci->ci_idepth++; #ifdef DEBUG_INTERRUPT trapdebug_enter(ci, trapframe, T_INT); @@ -144,7 +144,7 @@ interrupt(struct trapframe *trapframe) ci->ci_ipl = s; /* no-overhead splx */ } - ci->ci_intrdepth--; + ci->ci_idepth--; } @@ -254,7 +254,7 @@ splassert_check(int wantipl, const char *func) if (ci->ci_ipl < wantipl) splassert_fail(wantipl, ci->ci_ipl, func); - if (wantipl == IPL_NONE && ci->ci_intrdepth != 0) - splassert_fail(-1, ci->ci_intrdepth, func); + if (wantipl == IPL_NONE && ci->ci_idepth != 0) + splassert_fail(-1, ci->ci_idepth, func); } #endif |