Page MenuHomeFreeBSD
Files F107722349

D45383.diff
No OneTemporary
Actions

D45383.diff
View Options

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1609,8 +1609,8 @@
* Secondly, device memory mapped as part of setting up the low-
* level console(s) is taken from KVA, starting at virtual_avail.
* This is because cninit() is called after pmap_bootstrap() but
- * before vm_init() and pmap_init(). 20MB for a frame buffer is
- * not uncommon.
+ * before vm_mem_init() and pmap_init(). 20MB for a frame buffer
+ * is not uncommon.
*/
pt_pages += 32; /* 64MB additional slop. */
#endif
@@ -2449,7 +2449,8 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap
* system needs to map virtual memory.
*/
void
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -1705,8 +1705,9 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
- * system needs to map virtual memory.
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap system
+ * needs to map virtual memory.
*/
void
pmap_init(void)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -1629,7 +1629,8 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap
* system needs to map virtual memory.
*/
void
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -952,7 +952,8 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap
* system needs to map virtual memory.
*/
static void
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1266,7 +1266,8 @@
struct malloc_type_internal *mtip;
struct malloc_type *mtp;
- KASSERT(vm_cnt.v_page_count != 0, ("malloc_register before vm_init"));
+ KASSERT(vm_cnt.v_page_count != 0,
+ ("malloc_init() called before vm_mem_init()"));
mtp = data;
if (mtp->ks_version != M_VERSION)
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -1055,8 +1055,9 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
- * system needs to map virtual memory.
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap system
+ * needs to map virtual memory.
*/
static void
mmu_booke_init(void)
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -759,7 +759,8 @@
/*
* Initialize the pmap module.
- * Called by vm_init, to initialize any structures that the pmap
+ *
+ * Called by vm_mem_init(), to initialize any structures that the pmap
* system needs to map virtual memory.
*/
void
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -101,7 +101,7 @@
SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL);
/*
- * vm_init initializes the virtual memory system.
+ * vm_mem_init() initializes the virtual memory system.
* This is done only by the first cpu up.
*/
static void

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 7:21 PM (20 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15885688
Default Alt Text
D45383.diff (3 KB)

Event Timeline