interval_tree: Sync interval_tree_generic.h with tools

The following commit made an improvement to interval_tree_generic.h, but
didn't sync it to the tools copy:

  19811285784f ("lib/interval_tree: skip the check before go to the right subtree")

Sync it, and add it to objtool's sync-check.sh so they are more likely
to stay in sync going forward.

Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/tools/include/linux/interval_tree_generic.h b/tools/include/linux/interval_tree_generic.h
index aaa8a0767aa3a512c978d047556af3cee07af66f..1b400f26f63d69cd829b792ca9da9f06d7c6d0f9 100644 (file)
--- a/tools/include/linux/interval_tree_generic.h
+++ b/tools/include/linux/interval_tree_generic.h
@@ -104,12 +104,8 @@ ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)           \
                if (ITSTART(node) <= last) {            /* Cond1 */           \
                        if (start <= ITLAST(node))      /* Cond2 */           \
                                return node;    /* node is leftmost match */  \
-                       if (node->ITRB.rb_right) {                            \
-                               node = rb_entry(node->ITRB.rb_right,          \
-                                               ITSTRUCT, ITRB);              \
-                               if (start <= node->ITSUBTREE)                 \
-                                       continue;                             \
-                       }                                                     \
+                       node = rb_entry(node->ITRB.rb_right, ITSTRUCT, ITRB); \
+                       continue;                                             \
                }                                                             \
                return NULL;    /* No match */                                \
        }                                                                     \

diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh
index 81d120d0544255a0806013f3f32fcd4c98f8b297..86d64e3ac6f73c1d8d8394d0339d3711ae324ed4 100755 (executable)
--- a/tools/objtool/sync-check.sh
+++ b/tools/objtool/sync-check.sh
@@ -16,6 +16,7 @@ arch/x86/include/asm/orc_types.h
 arch/x86/include/asm/emulate_prefix.h
 arch/x86/lib/x86-opcode-map.txt
 arch/x86/tools/gen-insn-attr-x86.awk
+include/linux/interval_tree_generic.h
 include/linux/static_call_types.h
 "