Doug Ledford: powerpc compile fix

[Martin F. Krafft]

Module: mdadm
Branch: debian/0.9-metadata
Commit: 378bd2ecbefedbbf16bcd874f9de45bb97d299c4
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=378bd2ecbefedbbf16bcd874f9de45bb97d299c4

Author: Doug Ledford <dledford at redhat.com>
Date:   Tue Apr  6 14:04:30 2010 -0400

powerpc compile fix

Signed-off-by: Doug Ledford <dledford at redhat.com>
Signed-off-by: NeilBrown <neilb at suse.de>
Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog |    2 ++
 super-intel.c    |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd03e2d..c2ba28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mdadm (3.1.2-2) UNRELEASED; urgency=low
 
   * Fix logcheck regexp to cure "egrep: Unmatched [ or [^" message
     (closes: #583376).
+  * Cherry-pick 94fcb80 from upstream to fix compiler error due to argument
+    type error (at least on ia64, sparc, powerpc) (closes: #583495).
 
  -- martin f. krafft <madduck at debian.org>  Thu, 27 May 2010 15:31:49 +0200
 
diff --git a/super-intel.c b/super-intel.c
index a196ca3..999b970 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -697,7 +697,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
 		printf(" <-- %s", map_state_str[map->map_state]);
 		printf("\n     Checkpoint : %u (%llu)",
 		       __le32_to_cpu(dev->vol.curr_migr_unit),
-		       blocks_per_migr_unit(dev));
+		       (unsigned long long)blocks_per_migr_unit(dev));
 	}
 	printf("\n");
 	printf("    Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");