Page MenuHomeFreeBSD
Files F146738216

D17377.diff
No OneTemporary
Actions

D17377.diff
View Options

Index: head/sys/amd64/amd64/pmap.c
===================================================================
--- head/sys/amd64/amd64/pmap.c
+++ head/sys/amd64/amd64/pmap.c
@@ -1142,7 +1142,8 @@
/*
* Initialize the kernel pmap (which is statically allocated).
- * Count bootstrap data as being resident.
+ * Count bootstrap data as being resident in case any of this data is
+ * later unmapped (using pmap_remove()) and freed.
*/
PMAP_LOCK_INIT(kernel_pmap);
kernel_pmap->pm_pml4 = (pdp_entry_t *)PHYS_TO_DMAP(KPML4phys);
Index: head/sys/i386/i386/pmap.c
===================================================================
--- head/sys/i386/i386/pmap.c
+++ head/sys/i386/i386/pmap.c
@@ -579,8 +579,11 @@
vm_offset_t va;
pt_entry_t *pte, *unused;
struct pcpu *pc;
+ u_long res;
int i;
+ res = atop(firstaddr - (vm_paddr_t)KERNLOAD);
+
/*
* Add a physical memory segment (vm_phys_seg) corresponding to the
* preallocated kernel page table pages so that vm_page structures
@@ -598,11 +601,12 @@
* unused virtual address in addition to "firstaddr".
*/
virtual_avail = (vm_offset_t)firstaddr;
-
virtual_end = VM_MAX_KERNEL_ADDRESS;
/*
* Initialize the kernel pmap (which is statically allocated).
+ * Count bootstrap data as being resident in case any of this data is
+ * later unmapped (using pmap_remove()) and freed.
*/
PMAP_LOCK_INIT(kernel_pmap);
kernel_pmap->pm_pdir = IdlePTD;
@@ -610,6 +614,7 @@
kernel_pmap->pm_pdpt = IdlePDPT;
#endif
CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */
+ kernel_pmap->pm_stats.resident_count = res;
TAILQ_INIT(&kernel_pmap->pm_pvchunk);
/*

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 6, 4:21 AM (4 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29312340
Default Alt Text
D17377.diff (1 KB)

Event Timeline