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:

  1981128578 ("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>
This commit is contained in:
Josh Poimboeuf 2025-09-17 09:03:19 -07:00
parent 3049fc4b5f
commit 9b7eacac22
2 changed files with 3 additions and 6 deletions

View File

@ -104,12 +104,8 @@ ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last) \
if (ITSTART(node) <= last) { /* Cond1 */ \ if (ITSTART(node) <= last) { /* Cond1 */ \
if (start <= ITLAST(node)) /* Cond2 */ \ if (start <= ITLAST(node)) /* Cond2 */ \
return node; /* node is leftmost match */ \ return node; /* node is leftmost match */ \
if (node->ITRB.rb_right) { \ node = rb_entry(node->ITRB.rb_right, ITSTRUCT, ITRB); \
node = rb_entry(node->ITRB.rb_right, \ continue; \
ITSTRUCT, ITRB); \
if (start <= node->ITSUBTREE) \
continue; \
} \
} \ } \
return NULL; /* No match */ \ return NULL; /* No match */ \
} \ } \

View File

@ -16,6 +16,7 @@ arch/x86/include/asm/orc_types.h
arch/x86/include/asm/emulate_prefix.h arch/x86/include/asm/emulate_prefix.h
arch/x86/lib/x86-opcode-map.txt arch/x86/lib/x86-opcode-map.txt
arch/x86/tools/gen-insn-attr-x86.awk arch/x86/tools/gen-insn-attr-x86.awk
include/linux/interval_tree_generic.h
include/linux/static_call_types.h include/linux/static_call_types.h
" "