Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[powerpc.git] / arch / powerpc / lib / rheap.c

diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 57bf991..6c5c5dd 100644 (file)
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -14,6 +14,7 @@
  */
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 
@@ -85,7 +86,8 @@ static int grow(rh_info_t * info, int max_blocks)
        info->flags &= ~RHIF_STATIC_BLOCK;
 
        /* add all new blocks to the free list */
-       for (i = 0, blk = block + info->max_blocks; i < new_blocks; i++, blk++)
+       blk = block + info->max_blocks - new_blocks;
+       for (i = 0; i < new_blocks; i++, blk++)
                list_add(&blk->list, &info->empty_list);
 
        return 0;
@@ -670,7 +672,7 @@ void rh_dump(rh_info_t * info)
        int maxnr;
        int i, nr;
 
-       maxnr = sizeof(st) / sizeof(st[0]);
+       maxnr = ARRAY_SIZE(st);
 
        printk(KERN_INFO
               "info @0x%p (%d slots empty / %d max)\n",