diff options
author | Matthew McClintock <msm@freescale.com> | 2011-10-05 17:13:08 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:00 +0000 |
commit | 7bd151a4f33215b2b333db6241b79c111b7b2c2c (patch) | |
tree | cefd5d850fb2f30c16bbd86a3f94b48d52ad4f60 /meta/recipes-extended/mdadm/files | |
parent | e1f53370eda8915de957f2c79a4b8e53550a742d (diff) | |
download | poky-7bd151a4f33215b2b333db6241b79c111b7b2c2c.tar.gz |
Fix mdadm for powerpc64
This takes an upstream fix for compiling on powerpc64
(From OE-Core rev: 1325f506972555d4c218c15090bfa3f63fb13473)
(From OE-Core rev: c6da1a4eb9ba6885b49b0240030dff9b234ab1ca)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch new file mode 100644 index 0000000000..931ecbc16d --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 19986c721c9ac4b353c8592998d70d0dc8860bfd Mon Sep 17 00:00:00 2001 | ||
2 | From: Milan Broz <mbroz@redhat.com> | ||
3 | Date: Thu, 14 Jul 2011 13:58:36 +1000 | ||
4 | Subject: [PATCH] mdadm: fix build failures (ppc64) | ||
5 | |||
6 | This patch fixes these build issues: | ||
7 | |||
8 | super-intel.c: In function 'getinfo_super_imsm_volume': | ||
9 | super-intel.c:2327:4: error: format '%llu' expects argument of type 'long long | ||
10 | unsigned int', but argument 3 has type '__u64' [-Werror=format] | ||
11 | |||
12 | super-intel.c: In function 'imsm_reshape_super': | ||
13 | super-intel.c:8665:7: error: 'devnum' may be used uninitialized in this function [-Werror=uninitialized] | ||
14 | |||
15 | Signed-off-by: Milan Broz <mbroz@redhat.com> | ||
16 | Signed-off-by: NeilBrown <neilb@suse.de> | ||
17 | --- | ||
18 | super-intel.c | 9 ++++++--- | ||
19 | 1 files changed, 6 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/super-intel.c b/super-intel.c | ||
22 | index 5ea3b36..70cf993 100644 | ||
23 | --- a/super-intel.c | ||
24 | +++ b/super-intel.c | ||
25 | @@ -2326,7 +2326,9 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, | ||
26 | |||
27 | dprintf("IMSM: General Migration checkpoint : %llu " | ||
28 | "(%llu) -> read reshape progress : %llu\n", | ||
29 | - units, blocks_per_unit, info->reshape_progress); | ||
30 | + (unsigned long long)units, | ||
31 | + (unsigned long long)blocks_per_unit, | ||
32 | + info->reshape_progress); | ||
33 | |||
34 | used_disks = imsm_num_data_members(dev, 1); | ||
35 | if (used_disks > 0) { | ||
36 | @@ -8661,8 +8663,9 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level, | ||
37 | dprintf("imsm: info: Volume operation\n"); | ||
38 | /* find requested device */ | ||
39 | while (dev) { | ||
40 | - imsm_find_array_minor_by_subdev(dev->index, st->container_dev, &devnum); | ||
41 | - if (devnum == geo.dev_id) | ||
42 | + if (imsm_find_array_minor_by_subdev( | ||
43 | + dev->index, st->container_dev, &devnum) == 0 | ||
44 | + && devnum == geo.dev_id) | ||
45 | break; | ||
46 | dev = dev->next; | ||
47 | } | ||
48 | -- | ||
49 | 1.7.6.1 | ||
50 | |||