Author: markj
Date: Mon Aug 17 14:06:51 2020
New Revision: 364306
URL: https://svnweb.freebsd.org/changeset/base/364306
Log:
Commit a missing piece of r364302.
This had failed to apply due to a merge conflict.
Reported by: Jenkins
MFC with: r364302
Modified:
head/sys/vm/vm_kern.c
Modified: head/sys/vm/vm_kern.c
==============================================================================
--- head/sys/vm/vm_kern.c Mon Aug 17 13:51:25 2020 (r364305)
+++ head/sys/vm/vm_kern.c Mon Aug 17 14:06:51 2020 (r364306)
@@ -745,15 +745,13 @@ kva_import_domain(void *arena, vmem_size_t size, int f
void
kmem_init(vm_offset_t start, vm_offset_t end)
{
- vm_map_t m;
int domain;
- m = vm_map_create(kernel_pmap, VM_MIN_KERNEL_ADDRESS, end);
- m->system_map = 1;
- vm_map_lock(m);
+ vm_map_init(kernel_map, kernel_pmap, VM_MIN_KERNEL_ADDRESS, end);
+ kernel_map->system_map = 1;
+ vm_map_lock(kernel_map);
/* N.B.: cannot use kgdb to debug, starting with this assignment ... */
- kernel_map = m;
- (void)vm_map_insert(m, NULL, 0,
+ (void)vm_map_insert(kernel_map, NULL, 0,
#ifdef __amd64__
KERNBASE,
#else
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
