tools-lib-rbtree-pick-some-improvements-from-the-kernel-rbtree-code.patch removed from -mm tree
The quilt patch titled
Subject: tools lib rbtree: pick some improvements from the kernel rbtree code
has been removed from the -mm tree. Its filename was
tools-lib-rbtree-pick-some-improvements-from-the-kernel-rbtree-code.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Arnaldo Carvalho de Melo <[email protected]>
Subject: tools lib rbtree: pick some improvements from the kernel rbtree code
Date: Tue, 23 Apr 2024 17:27:57 -0300
The tools/lib/rbtree.c code came from the kernel. Remove the EXPORT_SYMBOL() that make sense only there. Unfortunately it is not being checked with tools/perf/check_headers.sh. Will try to remedy this. Until then pick the improvements from:
b0687c1119b4e8c8 ("lib/rbtree: use '+' instead of '|' for setting color.")
That I noticed by doing:
diff -u tools/lib/rbtree.c lib/rbtree.c
diff -u tools/include/linux/rbtree_augmented.h include/linux/rbtree_augmented.h
There is one other cases, but lets pick it in separate patches.
---
tools/include/linux/rbtree_augmented.h | 4 ++-- tools/lib/rbtree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/include/linux/rbtree_augmented.h renamed from tools/include/linux/rbtree_augmented.h~tools-lib-rbtree-pick-some-improvements-from-the-kernel-rbtree-code +2 -2
@@ -158,13 +158,13 @@ RB_DECLARE_CALLBACKS(RBSTATIC, RBNAME,static inline void rb_set_parent (struct rb_node *rb,struct rb_node *p) { - rb->__rb_parent_color =rb_color (rb) | (unsigned long )p; + rb->__rb_parent_color =rb_color (rb) + (unsigned long )p; }static inline void rb_set_parent_color (struct rb_node *rb,struct rb_node *p,int color) { - rb->__rb_parent_color = (unsigned long )p | color; + rb->__rb_parent_color = (unsigned long )p + color; } static inline void
tools/lib/rbtree.c renamed from tools/lib/rbtree.c~tools-lib-rbtree-pick-some-improvements-from-the-kernel-rbtree-code +1 -1
@@ -58,7 +58,7 @@static inline void rb_set_black (struct rb_node *rb) { - rb->__rb_parent_color |=RB_BLACK ; + rb->__rb_parent_color +=RB_BLACK ; }static inline struct rb_node *rb_red_parent (struct rb_node *red)
_
Patches currently in -mm which might be from [email protected] are