replace uvm.h includes with uvm_extern.h where possible

11 files changed, 20 insertions, 21 deletions

diff --git a/sys/arch/arm64/arm64/autoconf.c b/sys/arch/arm64/arm64/autoconf.c
index 75ef6d7da52..5d3d477a5e2 100644
--- a/sys/arch/arm64/arm64/autoconf.c
+++ b/sys/arch/arm64/arm64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.15 2024/07/17 15:21:59 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.16 2024/11/10 06:51:59 jsg Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -21,7 +21,7 @@
 #include <sys/reboot.h>
 #include <sys/hibernate.h>
 #include <sys/systm.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #if defined(NFSCLIENT)
 #include <net/if.h>
diff --git a/sys/arch/arm64/arm64/cpu.c b/sys/arch/arm64/arm64/cpu.c
index ee3a4cd94a0..24d1511049d 100644
--- a/sys/arch/arm64/arm64/cpu.c
+++ b/sys/arch/arm64/arm64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.133 2024/09/29 11:22:39 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.134 2024/11/10 06:51:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -29,7 +29,7 @@
 #include <sys/user.h>
 #include <sys/kstat.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/fdt.h>
 #include <machine/elf.h>
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index 0100d4f1321..1567670d790 100644
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.93 2024/11/10 05:59:27 jsg Exp $ */
+/* $OpenBSD: machdep.c,v 1.94 2024/11/10 06:51:59 jsg Exp $ */
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
@@ -35,7 +35,7 @@
 #include <sys/malloc.h>
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <dev/cons.h>
 #include <dev/ofw/fdt.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arch/arm64/arm64/trap.c b/sys/arch/arm64/arm64/trap.c
index 672b62ec054..0b70c4c2ead 100644
--- a/sys/arch/arm64/arm64/trap.c
+++ b/sys/arch/arm64/arm64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.49 2024/07/24 21:24:18 kettenis Exp $ */
+/* $OpenBSD: trap.c,v 1.50 2024/11/10 06:51:59 jsg Exp $ */
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
@@ -36,7 +36,6 @@
 #include <sys/signalvar.h>
 #include <sys/user.h>
 
-#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/riscv64/riscv64/autoconf.c b/sys/arch/riscv64/riscv64/autoconf.c
index 800f93ead91..c600f59b573 100644
--- a/sys/arch/riscv64/riscv64/autoconf.c
+++ b/sys/arch/riscv64/riscv64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.6 2022/09/08 10:22:06 kn Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.7 2024/11/10 06:51:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -21,7 +21,7 @@
 #include <sys/reboot.h>
 #include <sys/hibernate.h>
 #include <sys/systm.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #if defined(NFSCLIENT)
 #include <net/if.h>
diff --git a/sys/arch/riscv64/riscv64/cpu.c b/sys/arch/riscv64/riscv64/cpu.c
index 656c8f21887..e8400d4eed3 100644
--- a/sys/arch/riscv64/riscv64/cpu.c
+++ b/sys/arch/riscv64/riscv64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.20 2024/07/14 09:48:49 jca Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.21 2024/11/10 06:51:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -25,7 +25,7 @@
 #include <sys/sysctl.h>
 #include <sys/task.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/cpufunc.h>
 #include <machine/elf.h>
diff --git a/sys/arch/riscv64/riscv64/machdep.c b/sys/arch/riscv64/riscv64/machdep.c
index 9f2b01b4329..addea693298 100644
--- a/sys/arch/riscv64/riscv64/machdep.c
+++ b/sys/arch/riscv64/riscv64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.38 2024/04/06 18:33:54 kettenis Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.39 2024/11/10 06:51:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
@@ -35,7 +35,7 @@
 #include <sys/syscallargs.h>
 
 #include <net/if.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <dev/cons.h>
 #include <dev/ofw/fdt.h>
 #include <dev/ofw/openfirm.h>
diff --git a/sys/dev/ic/psp.c b/sys/dev/ic/psp.c
index 0eba7ad4d28..6f3a6519c61 100644
--- a/sys/dev/ic/psp.c
+++ b/sys/dev/ic/psp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psp.c,v 1.13 2024/11/09 11:47:47 bluhm Exp $ */
+/*	$OpenBSD: psp.c,v 1.14 2024/11/10 06:51:59 jsg Exp $ */
 
 /*
  * Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de>
@@ -27,7 +27,7 @@
 
 #include <machine/bus.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <crypto/xform.h>
 
 #include <dev/ic/ccpvar.h>
diff --git a/sys/dev/pci/drm/drm_gem_dma_helper.c b/sys/dev/pci/drm/drm_gem_dma_helper.c
index d8c8d3d0377..05bdfefecbf 100644
--- a/sys/dev/pci/drm/drm_gem_dma_helper.c
+++ b/sys/dev/pci/drm/drm_gem_dma_helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_gem_dma_helper.c,v 1.3 2024/01/16 23:37:51 jsg Exp $ */
+/* $OpenBSD: drm_gem_dma_helper.c,v 1.4 2024/11/10 06:51:59 jsg Exp $ */
 /* $NetBSD: drm_gem_dma_helper.c,v 1.9 2019/11/05 23:29:28 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca>
@@ -32,7 +32,7 @@
 #include <drm/drm_device.h>
 #include <drm/drm_gem_dma_helper.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = {
 	.free = drm_gem_dma_free_object,
diff --git a/sys/dev/pci/drm/drm_gem_ttm_helper.c b/sys/dev/pci/drm/drm_gem_ttm_helper.c
index 067ef4cc941..643c613d02c 100644
--- a/sys/dev/pci/drm/drm_gem_ttm_helper.c
+++ b/sys/dev/pci/drm/drm_gem_ttm_helper.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <linux/kernel.h>
 #include <linux/iosys-map.h>
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index ca0d00172e2..33a85a45fe3 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.267 2024/10/08 12:02:24 claudio Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.268 2024/11/10 06:51:59 jsg Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
 
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <machine/tcb.h>
 
 int	nprocesses = 1;		/* process 0 */