Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (32 commits)
  [POWERPC] Remove build warnings in windfarm_core
  [POWERPC] Pass per-file CFLAGs for platform specific op codes
  [POWERPC] Correct #endif comment
  [POWERPC] Fix ppc_rtas_progress_show()
  [POWERPC] Fix sed command lines for zlib source construction
  [POWERPC] Specify GNUTARGET on $(AR) invocations
  [POWERPC] Make sure device node type/name is not NULL on hot-added nodes
  [POWERPC] Small fixes for the Ebony device tree
  [POWERPC] Fix warning on UP
  [POWERPC] cell_defconfig: Disable cpufreq and pmi
  [POWERPC] Fix IO space on PCI buses created from of_platform
  [POWERPC] Add spinlock to request_phb_iospace()
  [POWERPC] Fix make rules for treeImage.initrd
  [POWERPC] Remove warning in mpic.c
  [POWERPC] Update pasemi_defconfig
  [POWERPC] pasemi: CONFIG_GENERIC_TBSYNC no longer needed
  [POWERPC] Update iseries_defconfig
  [POWERPC] Wire up some more syscalls
  [POWERPC] Fix bug adding properties with flatdevtree.c's ft_set_prop()
  [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
  ...

1 files changed, 8 insertions, 14 deletions

diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index b2f6dcc59600..180ee2933ab9 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -468,25 +468,19 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch
         if (blk->size == size) {
                 /* Move from free list to taken list */
                 list_del(&blk->list);
-                blk->owner = owner;
-                start = blk->start;
-
-                attach_taken_block(info, blk);
+                newblk = blk;
+        } else {
+                newblk = get_slot(info);
+                newblk->start = blk->start;
+                newblk->size = size;
 
-                return start;
+                /* blk still in free list, with updated start, size */
+                blk->start += size;
+                blk->size -= size;
         }
 
-        newblk = get_slot(info);
-        newblk->start = blk->start;
-        newblk->size = size;
         newblk->owner = owner;
-
-        /* blk still in free list, with updated start, size */
-        blk->start += size;
-        blk->size -= size;
-
         start = newblk->start;
-
         attach_taken_block(info, newblk);
 
         /* for larger alignment return fixed up pointer  */