Module Name: src
Committed By: skrll
Date: Sun Feb 26 07:13:55 UTC 2023
Modified Files:
src/sys/arch/mips/mips: cpu_subr.c
src/sys/arch/riscv/riscv: trap.c
src/sys/kern: kern_cpu.c
src/sys/uvm/pmap: pmap.c
Log Message:
ci_data.cpu_kcpuset -> ci_kcpuset
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/riscv/riscv/trap.c
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.74 -r1.75 src/sys/uvm/pmap/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.62 src/sys/arch/mips/mips/cpu_subr.c:1.63
--- src/sys/arch/mips/mips/cpu_subr.c:1.62 Wed Jul 20 10:07:49 2022
+++ src/sys/arch/mips/mips/cpu_subr.c Sun Feb 26 07:13:54 2023
@@ -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 @@ cpu_multicast_ipi(const kcpuset_t *kcp,
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 @@ cpu_halt_others(void)
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 @@ cpu_pause_others(void)
{
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);
Index: src/sys/arch/riscv/riscv/trap.c
diff -u src/sys/arch/riscv/riscv/trap.c:1.19 src/sys/arch/riscv/riscv/trap.c:1.20
--- src/sys/arch/riscv/riscv/trap.c:1.19 Sat Oct 15 06:41:43 2022
+++ src/sys/arch/riscv/riscv/trap.c Sun Feb 26 07:13:55 2023
@@ -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 @@ trap_pagefault_fixup(struct trapframe *t
if (attr & VM_PAGEMD_EXECPAGE)
pmap_md_page_syncicache(VM_PAGE_TO_MD(pg),
- curcpu()->ci_data.cpu_kcpuset);
+ curcpu()->ci_kcpuset);
return true;
}
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.93 src/sys/kern/kern_cpu.c:1.94
--- src/sys/kern/kern_cpu.c:1.93 Thu Oct 8 09:16:13 2020
+++ src/sys/kern/kern_cpu.c Sun Feb 26 07:13:55 2023
@@ -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 @@ mi_cpu_attach(struct cpu_info *ci)
/*
* 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);
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.74 src/sys/uvm/pmap/pmap.c:1.75
--- src/sys/uvm/pmap/pmap.c:1.74 Thu Nov 3 09:04:57 2022
+++ src/sys/uvm/pmap/pmap.c Sun Feb 26 07:13:55 2023
@@ -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 @@ pmap_page_syncicache(struct vm_page *pg)
}
#else
if (pv->pv_pmap == curpmap) {
- onproc = curcpu()->ci_data.cpu_kcpuset;
+ onproc = curcpu()->ci_kcpuset;
break;
}
#endif
