Merge branch 'akpm'

* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c

1 files changed, 17 insertions, 17 deletions

diff --git a/lib/rbtree.c b/lib/rbtree.c
index f653659e0bc1..e2aa3be29858 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -231,34 +231,34 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
                 node = node->rb_right;
                 while ((left = node->rb_left) != NULL)
                         node = left;
+
+                if (rb_parent(old)) {
+                        if (rb_parent(old)->rb_left == old)
+                                rb_parent(old)->rb_left = node;
+                        else
+                                rb_parent(old)->rb_right = node;
+                } else
+                        root->rb_node = node;
+
                 child = node->rb_right;
                 parent = rb_parent(node);
                 color = rb_color(node);
 
-                if (child)
-                        rb_set_parent(child, parent);
                 if (parent == old) {
-                        parent->rb_right = child;
                         parent = node;
-                } else
+                } else {
+                        if (child)
+                                rb_set_parent(child, parent);
                         parent->rb_left = child;
 
+                        node->rb_right = old->rb_right;
+                        rb_set_parent(old->rb_right, node);
+                }
+
                 node->rb_parent_color = old->rb_parent_color;
-                node->rb_right = old->rb_right;
                 node->rb_left = old->rb_left;
-
-                if (rb_parent(old))
-                {
-                        if (rb_parent(old)->rb_left == old)
-                                rb_parent(old)->rb_left = node;
-                        else
-                                rb_parent(old)->rb_right = node;
-                } else
-                        root->rb_node = node;
-
                 rb_set_parent(old->rb_left, node);
-                if (old->rb_right)
-                        rb_set_parent(old->rb_right, node);
+
                 goto color;
         }