summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-05-06 15:53:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:21 +0100
commit4f0c5e5b320df921d8f529a7e5543cd5eab22bbb (patch)
tree6c5d06e355d0a62f45ff0ad53b60945994fb5b30
parent9fb409bcc54119813ddc3f9345a8e2511f0f3887 (diff)
downloadpoky-4f0c5e5b320df921d8f529a7e5543cd5eab22bbb.tar.gz
mmc-utils: fix compilation failure for mips64 target.
This patch fixes mmc-utils compilation failure for qemumips64. Remove the 'include <asm-generic/int-ll64.h>' line from mmc.h, because this file is automatically included if _MIPS_SZLONG is not 64, otherwise, <asm-generic/int-l64.h> is included. Expicitly including <asm-generic/int-ll64.h> will cause the compilation failure for mips64 target. [YOCTO #6267] (From OE-Core rev: 5477cc86015be24cc5b232ac1f8c67cd8b65a740) (From OE-Core rev: 4512882dd819b76901a7ad39c130d85a8d7dd848) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch28
-rw-r--r--meta/recipes-devtools/mmc/mmc-utils_git.bb4
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
new file mode 100644
index 0000000000..1724de5c69
--- /dev/null
+++ b/meta/recipes-devtools/mmc/mmc-utils/0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Pending
2
3mmc.h: don't include <asm-generic/int-ll64.h>
4
5Including this file causes a compile failure for qemumips64.
6This file is not needed to be explicitly included, because it will be
7included by the <linux/mmc/ioctl.h> file if _MIPS_SZLONG is not 64.
8
9Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
10---
11 mmc.h | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/mmc.h b/mmc.h
15index 9871d62..3df2cdf 100644
16--- a/mmc.h
17+++ b/mmc.h
18@@ -14,7 +14,6 @@
19 * Boston, MA 021110-1307, USA.
20 */
21
22-#include <asm-generic/int-ll64.h>
23 #include <linux/mmc/ioctl.h>
24 #include <stdio.h>
25
26--
271.7.9.5
28
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index abde4b1110..d88520c786 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -8,8 +8,8 @@ SRCREV = "11f2ceabc4ad3f0dd568e0ce68166e4803e0615b"
8 8
9PV = "0.1" 9PV = "0.1"
10 10
11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH}" 11SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;protocol=git;branch=${BRANCH} \
12 12 file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15