Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / lib / rheap.c

diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 4bbda6b2be45a4b0748653cc30c5113ebcee3fe9..6c5c5dd183ee3ac79c57bf4f5cf744b91a15ad47 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>
 
@@ -671,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",