summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 08:17:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 22:24:11 +0100
commite91ce729735f7465afe09fd8fdce0112978f6945 (patch)
tree2618e5f5eaf21c67bcc5a8d6f13d74965571c6de /meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
parent020f33ca2a982fdf249a71c7aa8e59996475caf1 (diff)
downloadpoky-e91ce729735f7465afe09fd8fdce0112978f6945.tar.gz
kexec-tools: 2.0.9 -> 2.0.10
Drop patch merged upstream and part of x32 patch merged upstream. Refresh patches. (From OE-Core rev: ae831faa25fa7bbe8ebff313f1ae6e862bcbe602) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch')
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
index 8bb4fc49ad..e198eb6e9a 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
@@ -15,11 +15,11 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
15 kexec/fs2dt.c | 13 ++++++++++--- 15 kexec/fs2dt.c | 13 ++++++++++---
16 2 files changed, 20 insertions(+), 6 deletions(-) 16 2 files changed, 20 insertions(+), 6 deletions(-)
17 17
18diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c 18Index: kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
19index 4121c7d..cc04b04 100644 19===================================================================
20--- a/kexec/arch/ppc/fs2dt.c 20--- kexec-tools-2.0.10.orig/kexec/arch/ppc/fs2dt.c
21+++ b/kexec/arch/ppc/fs2dt.c 21+++ kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c
22@@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2) 22@@ -296,6 +296,9 @@ static int comparefunc(const void *dentr
23 { 23 {
24 char *str1 = (*(struct dirent **)dentry1)->d_name; 24 char *str1 = (*(struct dirent **)dentry1)->d_name;
25 char *str2 = (*(struct dirent **)dentry2)->d_name; 25 char *str2 = (*(struct dirent **)dentry2)->d_name;
@@ -29,7 +29,7 @@ index 4121c7d..cc04b04 100644
29 29
30 /* 30 /*
31 * strcmp scans from left to right and fails to idetify for some 31 * strcmp scans from left to right and fails to idetify for some
32@@ -303,9 +306,13 @@ static int comparefunc(const void *dentry1, const void *dentry2) 32@@ -303,9 +306,13 @@ static int comparefunc(const void *dentr
33 * Therefore, we get the wrong sorted order like memory@10000000 and 33 * Therefore, we get the wrong sorted order like memory@10000000 and
34 * memory@f000000. 34 * memory@f000000.
35 */ 35 */