The patch titled Subject: mm/mmap.c: clean up CONFIG_DEBUG_VM_RB checks has been removed from the -mm tree. Its filename was mm-mmapc-clean-up-config_debug_vm_rb-checks.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm/mmap.c: clean up CONFIG_DEBUG_VM_RB checks - be consistent in printing the test which failed - one message was actually wrong (a<b != b>a) - don't print second bogus warning if browse_rb() failed Cc: Sasha Levin <sasha.levin@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/mmap.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff -puN mm/mmap.c~mm-mmapc-clean-up-config_debug_vm_rb-checks mm/mmap.c --- a/mm/mmap.c~mm-mmapc-clean-up-config_debug_vm_rb-checks +++ a/mm/mmap.c @@ -368,16 +368,18 @@ static int browse_rb(struct rb_root *roo struct vm_area_struct *vma; vma = rb_entry(nd, struct vm_area_struct, vm_rb); if (vma->vm_start < prev) { - pr_emerg("vm_start %lx prev %lx\n", vma->vm_start, prev); + pr_emerg("vm_start %lx < prev %lx\n", + vma->vm_start, prev); bug = 1; } if (vma->vm_start < pend) { - pr_emerg("vm_start %lx pend %lx\n", vma->vm_start, pend); + pr_emerg("vm_start %lx < pend %lx\n", + vma->vm_start, pend); bug = 1; } if (vma->vm_start > vma->vm_end) { - pr_emerg("vm_end %lx < vm_start %lx\n", - vma->vm_end, vma->vm_start); + pr_emerg("vm_start %lx > vm_end %lx\n", + vma->vm_start, vma->vm_end); bug = 1; } if (vma->rb_subtree_gap != vma_compute_subtree_gap(vma)) { @@ -419,8 +421,10 @@ static void validate_mm(struct mm_struct int i = 0; unsigned long highest_address = 0; struct vm_area_struct *vma = mm->mmap; + while (vma) { struct anon_vma_chain *avc; + vma_lock_anon_vma(vma); list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) anon_vma_interval_tree_verify(avc); @@ -435,12 +439,13 @@ static void validate_mm(struct mm_struct } if (highest_address != mm->highest_vm_end) { pr_emerg("mm->highest_vm_end %lx, found %lx\n", - mm->highest_vm_end, highest_address); + mm->highest_vm_end, highest_address); bug = 1; } i = browse_rb(&mm->mm_rb); if (i != mm->map_count) { - pr_emerg("map_count %d rb %d\n", mm->map_count, i); + if (i != -1) + pr_emerg("map_count %d rb %d\n", mm->map_count, i); bug = 1; } BUG_ON(bug); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch kernel-add-support-for-gcc-5-checkpatch-fixes.patch o2dlm-fix-null-pointer-dereference-in-o2dlm_blocking_ast_wrapper-checkpatch-fixes.patch ocfs2-free-inode-when-i_count-becomes-zero.patch ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans-fix.patch mm.patch drivers-dma-coherent-add-initialization-from-device-tree-fix.patch drivers-dma-coherent-add-initialization-from-device-tree-fix-fix.patch drivers-dma-coherent-add-initialization-from-device-tree-checkpatch-fixes.patch drivers-dma-contiguous-add-initialization-from-device-tree-fix-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch checkpatch-fix-spello.patch checkpatch-warn-on-logging-functions-with-kern_level.patch rtc-rk808-add-rtc-driver-for-rk808-fix.patch rtc-bq32000-add-trickle-charger-option-with-device-tree-binding-checkpatch-fixes.patch rtc-max77686-use-ffs-to-calculate-tm_wday-fix.patch rtc-add-driver-for-maxim-77802-pmic-real-time-clock-v10-fix.patch rtc-pm8xxx-rework-to-support-pm8941-rtc-checkpatch-fixes.patch x86-optimize-resource-lookups-for-ioremap-fix.patch init-resolve-shadow-warnings-checkpatch-fixes.patch linux-next.patch linux-next-rejects.patch drivers-gpio-gpio-zevioc-fix-build.patch arch-x86-kernel-cpu-commonc-fix-unused-symbol-warning.patch mem-hotplug-fix-boot-failed-in-case-all-the-nodes-are-hotpluggable-checkpatch-fixes.patch lib-string_helpers-introduce-string_escape_mem-fix.patch lib-vsprintf-add-%pe-format-specifier-fix.patch wireless-hostap-proc-print-properly-escaped-ssid-fix.patch wireless-hostap-proc-print-properly-escaped-ssid-fix-2.patch watchdog-control-hard-lockup-detection-default-fix.patch mm-replace-remap_file_pages-syscall-with-emulation.patch debugging-keep-track-of-page-owners.patch debugging-keep-track-of-page-owners-fix.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html