diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-10-23 07:41:45 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-10-23 07:41:45 +0000 |
| commit | 109a9731edd4712ef7ff8c7c0a4b4143b499a11a (patch) | |
| tree | f2c83e14dd38ddaddfe35632db1a3d7dc1e50915 | |
| parent | 4f11620c27dd45e13c8e00625d8418aabf93c476 (diff) | |
Rename `ci_intrdepth' to `ci_idepth'.
ok jsg@, aoyama@
| -rw-r--r-- | sys/arch/m88k/include/cpu.h | 6 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/trap.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h index 37bc80a45ad..97fcbc5ec82 100644 --- a/sys/arch/m88k/include/cpu.h +++ b/sys/arch/m88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.81 2024/08/08 13:56:00 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.82 2024/10/23 07:41:44 mpi Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -146,7 +146,7 @@ struct cpu_info { ci_schedstate; /* scheduling state */ int ci_want_resched; /* need_resched() invoked */ - u_int ci_intrdepth; /* interrupt depth */ + u_int ci_idepth; /* interrupt depth */ int ci_ddb_state; /* ddb status */ #define CI_DDB_RUNNING 0 @@ -268,7 +268,7 @@ struct clockframe { #define CLKF_USERMODE(framep) (((framep)->tf.tf_epsr & PSR_MODE) == 0) #define CLKF_PC(framep) ((framep)->tf.tf_sxip & XIP_ADDR) #define CLKF_INTR(framep) \ - (((struct cpu_info *)(framep)->tf.tf_cpu)->ci_intrdepth > 1) + (((struct cpu_info *)(framep)->tf.tf_cpu)->ci_idepth > 1) #define aston(p) ((p)->p_md.md_astpending = 1) diff --git a/sys/arch/m88k/m88k/db_interface.c b/sys/arch/m88k/m88k/db_interface.c index a46b2261050..4d7347ba0fe 100644 --- a/sys/arch/m88k/m88k/db_interface.c +++ b/sys/arch/m88k/m88k/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.30 2024/05/22 14:25:47 jsg Exp $ */ +/* $OpenBSD: db_interface.c,v 1.31 2024/10/23 07:41:44 mpi Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -642,7 +642,7 @@ m88k_db_cpu_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif) db_printf("%ccpu%d %02x %-14s %08lx %08lx %3u %08x\n", (cpu == cpu_number()) ? '*' : ' ', CPU_INFO_UNIT(ci), ci->ci_flags, state, (register_t)ci->ci_curproc, - (register_t)ci->ci_curpcb, ci->ci_intrdepth, ci->ci_ipi); + (register_t)ci->ci_curpcb, ci->ci_idepth, ci->ci_ipi); } } diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c index ece0183b97c..adf46fccdf1 100644 --- a/sys/arch/m88k/m88k/trap.c +++ b/sys/arch/m88k/m88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.136 2024/10/20 06:54:11 jsg Exp $ */ +/* $OpenBSD: trap.c,v 1.137 2024/10/23 07:41:44 mpi Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * Copyright (c) 1998 Steve Murphree, Jr. @@ -170,9 +170,9 @@ interrupt(struct trapframe *frame) { struct cpu_info *ci = curcpu(); - ci->ci_intrdepth++; + ci->ci_idepth++; md_interrupt_func(frame); - ci->ci_intrdepth--; + ci->ci_idepth--; } #ifdef M88110 |