Author: markj
Date: Thu Jul 16 13:50:21 2020
New Revision: 363246
URL: https://svnweb.freebsd.org/changeset/base/363246
Log:
Fix a mismerge in r363243.
This is a direct commit to stable/12.
Reported by: Jenkins
Modified:
stable/12/sys/vm/vm_map.c
Modified: stable/12/sys/vm/vm_map.c
==============================================================================
--- stable/12/sys/vm/vm_map.c Thu Jul 16 13:38:20 2020 (r363245)
+++ stable/12/sys/vm/vm_map.c Thu Jul 16 13:50:21 2020 (r363246)
@@ -4860,72 +4860,6 @@ vm_map_range_valid_KBI(vm_map_t map, vm_offset_t start
return (vm_map_range_valid(map, start, end));
}
-#ifdef INVARIANTS
-static void
-_vm_map_assert_consistent(vm_map_t map, int check)
-{
- vm_map_entry_t entry, prev;
- vm_map_entry_t cur, header, lbound, ubound;
- vm_size_t max_left, max_right;
-
-#ifdef DIAGNOSTIC
- ++map->nupdates;
-#endif
- if (enable_vmmap_check != check)
- return;
-
- header = prev = &map->header;
- VM_MAP_ENTRY_FOREACH(entry, map) {
- KASSERT(prev->end <= entry->start,
- ("map %p prev->end = %jx, start = %jx", map,
- (uintmax_t)prev->end, (uintmax_t)entry->start));
- KASSERT(entry->start < entry->end,
- ("map %p start = %jx, end = %jx", map,
- (uintmax_t)entry->start, (uintmax_t)entry->end));
- KASSERT(entry->left == header ||
- entry->left->start < entry->start,
- ("map %p left->start = %jx, start = %jx", map,
- (uintmax_t)entry->left->start, (uintmax_t)entry->start));
- KASSERT(entry->right == header ||
- entry->start < entry->right->start,
- ("map %p start = %jx, right->start = %jx", map,
- (uintmax_t)entry->start, (uintmax_t)entry->right->start));
- cur = map->root;
- lbound = ubound = header;
- for (;;) {
- if (entry->start < cur->start) {
- ubound = cur;
- cur = cur->left;
- KASSERT(cur != lbound,
- ("map %p cannot find %jx",
- map, (uintmax_t)entry->start));
- } else if (cur->end <= entry->start) {
- lbound = cur;
- cur = cur->right;
- KASSERT(cur != ubound,
- ("map %p cannot find %jx",
- map, (uintmax_t)entry->start));
- } else {
- KASSERT(cur == entry,
- ("map %p cannot find %jx",
- map, (uintmax_t)entry->start));
- break;
- }
- }
- max_left = vm_map_entry_max_free_left(entry, lbound);
- max_right = vm_map_entry_max_free_right(entry, ubound);
- KASSERT(entry->max_free == vm_size_max(max_left, max_right),
- ("map %p max = %jx, max_left = %jx, max_right = %jx", map,
- (uintmax_t)entry->max_free,
- (uintmax_t)max_left, (uintmax_t)max_right));
- prev = entry;
- }
- KASSERT(prev->end <= entry->start,
- ("map %p prev->end = %jx, start = %jx", map,
- (uintmax_t)prev->end, (uintmax_t)entry->start));
-}
-#endif
-
#include "opt_ddb.h"
#ifdef DDB
#include <sys/kernel.h>
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
