diff options
Diffstat (limited to 'meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch')
| -rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch deleted file mode 100644 index 89a5d34c83..0000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From edf186f45d543e318400195cc25175387ff3f5c4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrea Adami <andrea.adami@gmail.com> | ||
| 3 | Date: Sun, 26 Aug 2018 21:40:06 +0200 | ||
| 4 | Subject: [PATCH] arm- backport from oe-core | ||
| 5 | |||
| 6 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
| 7 | |||
| 8 | --- | ||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | kexec/arch/arm/crashdump-arm.c | 5 ++++- | ||
| 12 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c | ||
| 15 | index daa4788..3f72b38 100644 | ||
| 16 | --- a/kexec/arch/arm/crashdump-arm.c | ||
| 17 | +++ b/kexec/arch/arm/crashdump-arm.c | ||
| 18 | @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | ||
| 19 | void *buf; | ||
| 20 | int err; | ||
| 21 | int last_ranges; | ||
| 22 | + unsigned short align_bit_shift = 20; | ||
| 23 | |||
| 24 | /* | ||
| 25 | * First fetch all the memory (RAM) ranges that we are going to pass to | ||
| 26 | @@ -281,6 +282,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | ||
| 27 | |||
| 28 | /* for support LPAE enabled kernel*/ | ||
| 29 | elf_info.class = ELFCLASS64; | ||
| 30 | + align_bit_shift = 21; | ||
| 31 | |||
| 32 | err = crash_create_elf64_headers(info, &elf_info, | ||
| 33 | usablemem_rgns.ranges, | ||
| 34 | @@ -302,8 +304,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) | ||
| 35 | * 1MB) so that available memory passed in kernel command line will be | ||
| 36 | * aligned to 1MB. This is because kernel create_mapping() wants memory | ||
| 37 | * regions to be aligned to SECTION_SIZE. | ||
| 38 | + * The SECTION_SIZE of LPAE kernel is '1UL << 21' defined in pgtable-3level.h | ||
| 39 | */ | ||
| 40 | - elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20, | ||
| 41 | + elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << align_bit_shift, | ||
| 42 | crash_kernel_mem.start, | ||
| 43 | crash_kernel_mem.end, -1, 0); | ||
| 44 | |||
