aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
diff options
context:
space:
mode:
authorzhengrq <zhengrq.fnst@cn.fujitsu.com>2017-11-08 17:56:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 12:56:24 +0000
commitd2f196351a8e30542d5fb1561cb7960b6673c5ab (patch)
tree73ff43f1560ec9b562c82ec44af9245c9fa52d73 /meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
parentef34ed6282627005d0077f88235fdbe42dea23a3 (diff)
downloadopenembedded-core-contrib-d2f196351a8e30542d5fb1561cb7960b6673c5ab.tar.gz
kexec-tools: 2.0.14 -> 2.0.15
1) Upgrade kexec-tools from 2.0.14 to 2.0.15. 2) Remove patches that are included in 2.0.15. kexec-tools/0001-arm64-Disable-PIC.patch kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch kexec-tools/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch kexec-tools/0001-x86-x86_64-Fix-format-warning-with-die.patch kexec-tools/0002-kexec-generalize-and-rename-get_kernel_stext_sym.patch kexec-tools/0002-ppc-Fix-format-warning-with-die.patch kexec-tools/0003-arm64-identify-PHYS_OFFSET-correctly.patch kexec-tools/0004-arm64-kdump-identify-memory-regions.patch kexec-tools/0005-arm64-kdump-add-elf-core-header-segment.patch kexec-tools/0006-arm64-kdump-set-up-kernel-image-segment.patch kexec-tools/0007-arm64-kdump-set-up-other-segments.patch kexec-tools/0008-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch kexec-tools/0009-arm64-kdump-Add-support-for-binary-image-files.patch Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch78
1 files changed, 0 insertions, 78 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
deleted file mode 100644
index 822f28c44b..0000000000
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 02eed0f8f2748fd7579f69e5373445b52b2b8754 Mon Sep 17 00:00:00 2001
-From: AKASHI Takahiro <takahiro.akashi@linaro.org>
-Date: Mon, 17 Oct 2016 13:56:58 +0900
-Subject: [PATCH 1/9] kexec: exntend the semantics of kexec_iomem_for_each_line
-
-The current kexec_iomem_for_each_line() counts up all the lines for which
-a callback function returns zero(0) or positive, and otherwise it stops
-further scanning.
-This behavior is incovenient in some cases. For instance, on arm64, we want
-to count up "System RAM" entries, but need to skip "reserved" entries.
-
-So this patch extends the semantics so that we will continue to scan
-succeeding entries but not count lines for which a callback function
-returns positive.
-
-The current users of kexec_iomem_for_each_line(), arm, sh and x86, will not
-be affected by this change because
-* arm
- The callback function only returns -1 or 0, and the return value of
- kexec_iomem_for_each_line() will never be used.
-* sh, x86
- The callback function may return (-1 for sh,) 0 or 1, but always returns
- 1 once we have reached the maximum number of entries allowed.
- Even so the current kexec_iomem_for_each_line() counts them up.
- This change actually fixes this bug.
-
-Upstream-Status: Backport [https://git.linaro.org/people/takahiro.akashi/kexec-tools.git]
-
-Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- kexec/kexec-iomem.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/kexec/kexec-iomem.c b/kexec/kexec-iomem.c
-index 485a2e8..0a0277a 100644
---- a/kexec/kexec-iomem.c
-+++ b/kexec/kexec-iomem.c
-@@ -18,6 +18,9 @@
- * Iterate over each line in the file returned by proc_iomem(). If match is
- * NULL or if the line matches with our match-pattern then call the
- * callback if non-NULL.
-+ * If match is NULL, callback should return a negative if error.
-+ * Otherwise the interation goes on, incrementing nr but only if callback
-+ * returns 0 (matched).
- *
- * Return the number of lines matched.
- */
-@@ -37,7 +40,7 @@ int kexec_iomem_for_each_line(char *match,
- char *str;
- int consumed;
- int count;
-- int nr = 0;
-+ int nr = 0, ret;
-
- fp = fopen(iomem, "r");
- if (!fp)
-@@ -50,11 +53,13 @@ int kexec_iomem_for_each_line(char *match,
- str = line + consumed;
- size = end - start + 1;
- if (!match || memcmp(str, match, strlen(match)) == 0) {
-- if (callback
-- && callback(data, nr, str, start, size) < 0) {
-- break;
-+ if (callback) {
-+ ret = callback(data, nr, str, start, size);
-+ if (ret < 0)
-+ break;
-+ else if (ret == 0)
-+ nr++;
- }
-- nr++;
- }
- }
-
---
-1.9.1
-