Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:22:07 UTC 2022
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
src/sys/kern: kern_module.c subr_kobj.c
src/sys/rump/librump/rumpkern: vm.c
Log Message:
sys/*: Get module_map consistently from sys/module.h.
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.159 -r1.160 src/sys/kern/kern_module.c
cvs rdiff -u -r1.73 -r1.74 src/sys/kern/subr_kobj.c
cvs rdiff -u -r1.193 -r1.194 src/sys/rump/librump/rumpkern/vm.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/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.363 src/sys/arch/amd64/amd64/machdep.c:1.364
--- src/sys/arch/amd64/amd64/machdep.c:1.363 Sat Aug 20 23:48:50 2022
+++ src/sys/arch/amd64/amd64/machdep.c Wed Oct 26 23:22:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.363 2022/08/20 23:48:50 riastradh Exp $ */
+/* $NetBSD: machdep.c,v 1.364 2022/10/26 23:22:07 riastradh Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.363 2022/08/20 23:48:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.364 2022/10/26 23:22:07 riastradh Exp $");
#include "opt_modular.h"
#include "opt_user_ldt.h"
@@ -153,6 +153,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/asan.h>
#include <sys/csan.h>
#include <sys/msan.h>
+#include <sys/module.h>
#ifdef KGDB
#include <sys/kgdb.h>
@@ -268,7 +269,6 @@ vaddr_t ldt_vaddr;
paddr_t ldt_paddr;
static struct vm_map module_map_store;
-extern struct vm_map *module_map;
extern struct bootspace bootspace;
extern struct slotspace slotspace;
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.159 src/sys/kern/kern_module.c:1.160
--- src/sys/kern/kern_module.c:1.159 Tue Sep 6 13:31:09 2022
+++ src/sys/kern/kern_module.c Wed Oct 26 23:22:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.159 2022/09/06 13:31:09 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.160 2022/10/26 23:22:07 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.159 2022/09/06 13:31:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.160 2022/10/26 23:22:07 riastradh Exp $");
#define _MODULE_INTERNAL
@@ -411,7 +411,6 @@ void
module_init(void)
{
__link_set_decl(modules, modinfo_t);
- extern struct vm_map *module_map;
modinfo_t *const *mip;
int rv;
Index: src/sys/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.73 src/sys/kern/subr_kobj.c:1.74
--- src/sys/kern/subr_kobj.c:1.73 Sat Oct 15 15:28:23 2022
+++ src/sys/kern/subr_kobj.c Wed Oct 26 23:22:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.73 2022/10/15 15:28:23 riastradh Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.74 2022/10/26 23:22:07 riastradh Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.73 2022/10/15 15:28:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.74 2022/10/26 23:22:07 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -95,8 +95,6 @@ static void kobj_close(kobj_t);
static int kobj_read_mem(kobj_t, void **, size_t, off_t, bool);
static void kobj_close_mem(kobj_t);
-extern struct vm_map *module_map;
-
/*
* kobj_load_mem:
*
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.193 src/sys/rump/librump/rumpkern/vm.c:1.194
--- src/sys/rump/librump/rumpkern/vm.c:1.193 Sun Aug 21 10:18:20 2022
+++ src/sys/rump/librump/rumpkern/vm.c Wed Oct 26 23:22:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.193 2022/08/21 10:18:20 riastradh Exp $ */
+/* $NetBSD: vm.c,v 1.194 2022/10/26 23:22:07 riastradh Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.193 2022/08/21 10:18:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.194 2022/10/26 23:22:07 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.193
#include <sys/null.h>
#include <sys/vnode.h>
#include <sys/radixtree.h>
+#include <sys/module.h>
#include <machine/pmap.h>
@@ -97,7 +98,6 @@ static struct vm_map kernel_map_store;
struct vm_map *kernel_map = &kernel_map_store;
static struct vm_map module_map_store;
-extern struct vm_map *module_map;
static struct pmap pmap_kernel;
struct pmap rump_pmap_local;
