diff options
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch index 832fe67716..e874a8b4f1 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 55e583d20651e829afbbc8dba0f8ec3017cda2d5 Mon Sep 17 00:00:00 2001 | 1 | From b62c1da8f8e641397add10367ee9c4cfdedb1cc0 Mon Sep 17 00:00:00 2001 |
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
3 | Date: Mon, 9 Jan 2017 15:26:29 +0800 | 3 | Date: Mon, 9 Jan 2017 15:26:29 +0800 |
4 | Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue | 4 | Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue |
@@ -12,15 +12,16 @@ Upstream-Status: Pending | |||
12 | 12 | ||
13 | Suggested-By:fredrik.markstrom@gmail.com | 13 | Suggested-By:fredrik.markstrom@gmail.com |
14 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> | 14 | Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | kexec/arch/arm/crashdump-arm.c | 5 ++++- | 17 | kexec/arch/arm/crashdump-arm.c | 5 ++++- |
17 | 1 file changed, 4 insertions(+), 1 deletion(-) | 18 | 1 file changed, 4 insertions(+), 1 deletion(-) |
18 | 19 | ||
19 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c | 20 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c |
20 | index daa4788..3f72b38 100644 | 21 | index 1ec1826..cc20f63 100644 |
21 | --- a/kexec/arch/arm/crashdump-arm.c | 22 | --- a/kexec/arch/arm/crashdump-arm.c |
22 | +++ b/kexec/arch/arm/crashdump-arm.c | 23 | +++ b/kexec/arch/arm/crashdump-arm.c |
23 | @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 24 | @@ -242,6 +242,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
24 | void *buf; | 25 | void *buf; |
25 | int err; | 26 | int err; |
26 | int last_ranges; | 27 | int last_ranges; |
@@ -28,7 +29,7 @@ index daa4788..3f72b38 100644 | |||
28 | 29 | ||
29 | /* | 30 | /* |
30 | * First fetch all the memory (RAM) ranges that we are going to pass to | 31 | * First fetch all the memory (RAM) ranges that we are going to pass to |
31 | @@ -281,6 +282,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 32 | @@ -283,6 +284,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
32 | 33 | ||
33 | /* for support LPAE enabled kernel*/ | 34 | /* for support LPAE enabled kernel*/ |
34 | elf_info.class = ELFCLASS64; | 35 | elf_info.class = ELFCLASS64; |
@@ -36,7 +37,7 @@ index daa4788..3f72b38 100644 | |||
36 | 37 | ||
37 | err = crash_create_elf64_headers(info, &elf_info, | 38 | err = crash_create_elf64_headers(info, &elf_info, |
38 | usablemem_rgns.ranges, | 39 | usablemem_rgns.ranges, |
39 | @@ -302,8 +304,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | 40 | @@ -304,8 +306,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) |
40 | * 1MB) so that available memory passed in kernel command line will be | 41 | * 1MB) so that available memory passed in kernel command line will be |
41 | * aligned to 1MB. This is because kernel create_mapping() wants memory | 42 | * aligned to 1MB. This is because kernel create_mapping() wants memory |
42 | * regions to be aligned to SECTION_SIZE. | 43 | * regions to be aligned to SECTION_SIZE. |