diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-04-19 10:22:52 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2024-04-19 10:22:52 +0000 |
| commit | 68acfc6e1e716f102731791b8bb7b2ab1c482686 (patch) | |
| tree | 2d3484af8d6f36167f1df9e54b9cf37c5a28cbcb /sys/arch | |
| parent | 5c78de79d201b5311976d0ff89fc20423df0762a (diff) | |
Revert per-CPU caches a double-free has been found by naddy@.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/include/cpu.h | 5 | ||||
| -rw-r--r-- | sys/arch/arm64/include/cpu.h | 5 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index a6377384ea5..998fc8edd51 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.166 2024/04/17 13:12:58 mpi Exp $ */ +/* $OpenBSD: cpu.h,v 1.167 2024/04/19 10:22:50 mpi Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -53,7 +53,6 @@ #include <sys/sched.h> #include <sys/sensors.h> #include <sys/srp.h> -#include <uvm/uvm_percpu.h> #ifdef _KERNEL @@ -211,8 +210,6 @@ struct cpu_info { #ifdef MULTIPROCESSOR struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM]; -#define __HAVE_UVM_PERCPU - struct uvm_pmr_cache ci_uvm; /* [o] page cache */ #endif struct ksensordev ci_sensordev; diff --git a/sys/arch/arm64/include/cpu.h b/sys/arch/arm64/include/cpu.h index ee820bb65b0..fc44e19d14e 100644 --- a/sys/arch/arm64/include/cpu.h +++ b/sys/arch/arm64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.44 2024/04/17 13:12:58 mpi Exp $ */ +/* $OpenBSD: cpu.h,v 1.45 2024/04/19 10:22:50 mpi Exp $ */ /* * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com> * @@ -108,7 +108,6 @@ void arm32_vector_init(vaddr_t, int); #include <sys/device.h> #include <sys/sched.h> #include <sys/srp.h> -#include <uvm/uvm_percpu.h> struct cpu_info { struct device *ci_dev; /* Device corresponding to this CPU */ @@ -162,8 +161,6 @@ struct cpu_info { #ifdef MULTIPROCESSOR struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM]; -#define __HAVE_UVM_PERCPU - struct uvm_pmr_cache ci_uvm; volatile int ci_flags; volatile int ci_ddb_paused; diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 9ad7163dccc..5709bf5480c 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.186 2024/04/17 13:12:58 mpi Exp $ */ +/* $OpenBSD: cpu.h,v 1.187 2024/04/19 10:22:50 mpi Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -69,7 +69,6 @@ #include <sys/sched.h> #include <sys/sensors.h> #include <sys/srp.h> -#include <uvm/uvm_percpu.h> struct intrsource; @@ -100,8 +99,6 @@ struct cpu_info { #if defined(MULTIPROCESSOR) struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM]; -#define __HAVE_UVM_PERCPU - struct uvm_pmr_cache ci_uvm; #endif /* |