diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-10-25 08:08:25 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-10-25 08:08:25 +0000 |
| commit | ae9550c1949a1940717431c3ae7e11317814f4e7 (patch) | |
| tree | 04b7829ac04f74fc453e880369b574aa4842bf0a /sys/arch | |
| parent | 50c9a617287517670ab4d58c1bbbf246d0e1b89d (diff) | |
Rename `ci_intrdepth' to `ci_idepth'.
ok jsg@, miod@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/alpha/interrupt.c | 14 | ||||
| -rw-r--r-- | sys/arch/alpha/include/cpu.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c index 4b67b42ead2..89c76b2654a 100644 --- a/sys/arch/alpha/alpha/interrupt.c +++ b/sys/arch/alpha/alpha/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.41 2022/12/10 15:02:29 cheloha Exp $ */ +/* $OpenBSD: interrupt.c,v 1.42 2024/10/25 08:08:24 mpi Exp $ */ /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */ /*- @@ -204,7 +204,7 @@ interrupt(unsigned long a0, unsigned long a1, unsigned long a2, switch (a0) { case ALPHA_INTR_XPROC: /* interprocessor interrupt */ #if defined(MULTIPROCESSOR) - atomic_add_ulong(&ci->ci_intrdepth, 1); + atomic_add_ulong(&ci->ci_idepth, 1); alpha_ipi_process(ci, framep); @@ -216,7 +216,7 @@ interrupt(unsigned long a0, unsigned long a1, unsigned long a2, hwrpb->rpb_txrdy != 0) cpu_iccb_receive(); - atomic_sub_ulong(&ci->ci_intrdepth, 1); + atomic_sub_ulong(&ci->ci_idepth, 1); #else printf("WARNING: received interprocessor interrupt!\n"); #endif /* MULTIPROCESSOR */ @@ -231,13 +231,13 @@ interrupt(unsigned long a0, unsigned long a1, unsigned long a2, break; case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ - atomic_add_ulong(&ci->ci_intrdepth, 1); + atomic_add_ulong(&ci->ci_idepth, 1); a0 = alpha_pal_rdmces(); if (platform.mcheck_handler) (*platform.mcheck_handler)(a0, framep, a1, a2); else machine_check(a0, framep, a1, a2); - atomic_sub_ulong(&ci->ci_intrdepth, 1); + atomic_sub_ulong(&ci->ci_idepth, 1); break; case ALPHA_INTR_DEVICE: /* I/O device interrupt */ @@ -246,11 +246,11 @@ interrupt(unsigned long a0, unsigned long a1, unsigned long a2, KDASSERT(a1 >= SCB_IOVECBASE && a1 < SCB_SIZE); - atomic_add_ulong(&ci->ci_intrdepth, 1); + atomic_add_ulong(&ci->ci_idepth, 1); atomic_add_int(&uvmexp.intrs, 1); scb = &scb_iovectab[SCB_VECTOIDX(a1 - SCB_IOVECBASE)]; (*scb->scb_func)(scb->scb_arg, a1); - atomic_sub_ulong(&ci->ci_intrdepth, 1); + atomic_sub_ulong(&ci->ci_idepth, 1); break; } diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h index 21377986c8b..036af98a4a8 100644 --- a/sys/arch/alpha/include/cpu.h +++ b/sys/arch/alpha/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.76 2024/08/28 17:37:12 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.77 2024/10/25 08:08:24 mpi Exp $ */ /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */ /*- @@ -205,7 +205,7 @@ struct cpu_info { paddr_t ci_idle_pcb_paddr; /* PA of idle PCB */ struct device *ci_dev; /* pointer to our device */ u_long ci_want_resched; /* preempt current process */ - u_long ci_intrdepth; /* interrupt trap depth */ + u_long ci_idepth; /* interrupt trap depth */ struct trapframe *ci_db_regs; /* registers for debuggers */ #if defined(MULTIPROCESSOR) @@ -320,7 +320,7 @@ struct clockframe { * r/m/w cycle is complete, we won't be counted... but it's not * like this statistic has to be extremely accurate. */ -#define CLKF_INTR(framep) (curcpu()->ci_intrdepth) +#define CLKF_INTR(framep) (curcpu()->ci_idepth) /* * This is used during profiling to integrate system time. |