[src/trunk]: src/sys/uvm/pmap ci_data.cpu_kcpuset -> ci_kcpuset

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2d87afd96f8
branches:  trunk
changeset: 373757:a2d87afd96f8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Feb 26 07:13:54 2023 +0000

description:
ci_data.cpu_kcpuset -> ci_kcpuset

NFCI.

diffstat:

 sys/arch/mips/mips/cpu_subr.c |  16 ++++++++--------
 sys/arch/riscv/riscv/trap.c   |   6 +++---
 sys/kern/kern_cpu.c           |   8 ++++----
 sys/uvm/pmap/pmap.c           |   6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diffs (147 lines):

diff -r 7485e2c604c5 -r a2d87afd96f8 sys/arch/mips/mips/cpu_subr.c
--- a/sys/arch/mips/mips/cpu_subr.c     Sun Feb 26 06:08:06 2023 +0000
+++ b/sys/arch/mips/mips/cpu_subr.c     Sun Feb 26 07:13:54 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_subr.c,v 1.62 2022/07/20 10:07:49 riastradh Exp $  */
+/*     $NetBSD: cpu_subr.c,v 1.63 2023/02/26 07:13:54 skrll Exp $      */
 
 /*-
  * Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.62 2022/07/20 10:07:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.63 2023/02/26 07:13:54 skrll Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -656,11 +656,11 @@
        struct cpu_info * const ci = curcpu();
        kcpuset_t *kcp2 = ci->ci_multicastcpus;
 
-       if (kcpuset_match(cpus_running, ci->ci_data.cpu_kcpuset))
+       if (kcpuset_match(cpus_running, ci->ci_kcpuset))
                return;
 
        kcpuset_copy(kcp2, kcp);
-       kcpuset_remove(kcp2, ci->ci_data.cpu_kcpuset);
+       kcpuset_remove(kcp2, ci->ci_kcpuset);
        for (cpuid_t cii; (cii = kcpuset_ffs(kcp2)) != 0; ) {
                kcpuset_clear(kcp2, --cii);
                (void)cpu_send_ipi(cpu_lookup(cii), tag);
@@ -729,13 +729,13 @@
        kcpuset_t *kcp;
 
        // If we are the only CPU running, there's nothing to do.
-       if (kcpuset_match(cpus_running, curcpu()->ci_data.cpu_kcpuset))
+       if (kcpuset_match(cpus_running, curcpu()->ci_kcpuset))
                return;
 
        // Get all running CPUs
        kcpuset_clone(&kcp, cpus_running);
        // Remove ourself
-       kcpuset_remove(kcp, curcpu()->ci_data.cpu_kcpuset);
+       kcpuset_remove(kcp, curcpu()->ci_kcpuset);
        // Remove any halted CPUs
        kcpuset_remove(kcp, cpus_halted);
        // If there are CPUs left, send the IPIs
@@ -792,13 +792,13 @@
 {
        struct cpu_info * const ci = curcpu();
 
-       if (cold || kcpuset_match(cpus_running, ci->ci_data.cpu_kcpuset))
+       if (cold || kcpuset_match(cpus_running, ci->ci_kcpuset))
                return;
 
        kcpuset_t *kcp = ci->ci_ddbcpus;
 
        kcpuset_copy(kcp, cpus_running);
-       kcpuset_remove(kcp, ci->ci_data.cpu_kcpuset);
+       kcpuset_remove(kcp, ci->ci_kcpuset);
        kcpuset_remove(kcp, cpus_paused);
 
        cpu_broadcast_ipi(IPI_SUSPEND);
diff -r 7485e2c604c5 -r a2d87afd96f8 sys/arch/riscv/riscv/trap.c
--- a/sys/arch/riscv/riscv/trap.c       Sun Feb 26 06:08:06 2023 +0000
+++ b/sys/arch/riscv/riscv/trap.c       Sun Feb 26 07:13:54 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.19 2022/10/15 06:41:43 simonb Exp $ */
+/*     $NetBSD: trap.c,v 1.20 2023/02/26 07:13:55 skrll Exp $  */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #define        __PMAP_PRIVATE
 #define        __UFETCHSTORE_PRIVATE
 
-__RCSID("$NetBSD: trap.c,v 1.19 2022/10/15 06:41:43 simonb Exp $");
+__RCSID("$NetBSD: trap.c,v 1.20 2023/02/26 07:13:55 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -296,7 +296,7 @@
 
        if (attr & VM_PAGEMD_EXECPAGE)
                pmap_md_page_syncicache(VM_PAGE_TO_MD(pg),
-                   curcpu()->ci_data.cpu_kcpuset);
+                   curcpu()->ci_kcpuset);
 
        return true;
 }
diff -r 7485e2c604c5 -r a2d87afd96f8 sys/kern/kern_cpu.c
--- a/sys/kern/kern_cpu.c       Sun Feb 26 06:08:06 2023 +0000
+++ b/sys/kern/kern_cpu.c       Sun Feb 26 07:13:54 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $        */
+/*     $NetBSD: kern_cpu.c,v 1.94 2023/02/26 07:13:55 skrll Exp $      */
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.94 2023/02/26 07:13:55 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_cpu_ucode.h"
@@ -137,8 +137,8 @@
        /*
         * Create a convenience cpuset of just ourselves.
         */
-       kcpuset_create(&ci->ci_data.cpu_kcpuset, true);
-       kcpuset_set(ci->ci_data.cpu_kcpuset, cpu_index(ci));
+       kcpuset_create(&ci->ci_kcpuset, true);
+       kcpuset_set(ci->ci_kcpuset, cpu_index(ci));
 
        TAILQ_INIT(&ci->ci_data.cpu_ld_locks);
        __cpu_simple_lock_init(&ci->ci_data.cpu_ld_lock);
diff -r 7485e2c604c5 -r a2d87afd96f8 sys/uvm/pmap/pmap.c
--- a/sys/uvm/pmap/pmap.c       Sun Feb 26 06:08:06 2023 +0000
+++ b/sys/uvm/pmap/pmap.c       Sun Feb 26 07:13:54 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.74 2022/11/03 09:04:57 skrll Exp $  */
+/*     $NetBSD: pmap.c,v 1.75 2023/02/26 07:13:55 skrll Exp $  */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74 2022/11/03 09:04:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.75 2023/02/26 07:13:55 skrll Exp $");
 
 /*
  *     Manages physical address maps.
@@ -471,7 +471,7 @@
                        }
 #else
                        if (pv->pv_pmap == curpmap) {
-                               onproc = curcpu()->ci_data.cpu_kcpuset;
+                               onproc = curcpu()->ci_kcpuset;
                                break;
                        }
 #endif