Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+3
-6
+2
-6
tools/include/linux/interval_tree_generic.h
+2
-6
tools/include/linux/interval_tree_generic.h
···
104
104
if (ITSTART(node) <= last) { /* Cond1 */ \
105
105
if (start <= ITLAST(node)) /* Cond2 */ \
106
106
return node; /* node is leftmost match */ \
107
-
if (node->ITRB.rb_right) { \
108
-
node = rb_entry(node->ITRB.rb_right, \
109
-
ITSTRUCT, ITRB); \
110
-
if (start <= node->ITSUBTREE) \
111
-
continue; \
112
-
} \
107
+
node = rb_entry(node->ITRB.rb_right, ITSTRUCT, ITRB); \
108
+
continue; \
113
109
} \
114
110
return NULL; /* No match */ \
115
111
} \