Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/rbtree.c b/lib/rbtree.c
index 9956b99649f0..f653659e0bc1 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -163,17 +163,14 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
                         {
                                 if (!other->rb_right || rb_is_black(other->rb_right))
                                 {
-                                        struct rb_node *o_left;
-                                        if ((o_left = other->rb_left))
-                                                rb_set_black(o_left);
+                                        rb_set_black(other->rb_left);
                                         rb_set_red(other);
                                         __rb_rotate_right(other, root);
                                         other = parent->rb_right;
                                 }
                                 rb_set_color(other, rb_color(parent));
                                 rb_set_black(parent);
-                                if (other->rb_right)
-                                        rb_set_black(other->rb_right);
+                                rb_set_black(other->rb_right);
                                 __rb_rotate_left(parent, root);
                                 node = root->rb_node;
                                 break;
@@ -200,17 +197,14 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
                         {
                                 if (!other->rb_left || rb_is_black(other->rb_left))
                                 {
-                                        register struct rb_node *o_right;
-                                        if ((o_right = other->rb_right))
-                                                rb_set_black(o_right);
+                                        rb_set_black(other->rb_right);
                                         rb_set_red(other);
                                         __rb_rotate_left(other, root);
                                         other = parent->rb_left;
                                 }
                                 rb_set_color(other, rb_color(parent));
                                 rb_set_black(parent);
-                                if (other->rb_left)
-                                        rb_set_black(other->rb_left);
+                                rb_set_black(other->rb_left);
                                 __rb_rotate_right(parent, root);
                                 node = root->rb_node;
                                 break;