658db69940
Since in Fedora 25 kernel kaslr is enabled (x86) but makedumpfile can not save a correct vmcore, so it means kdump default setup will not work. Pratyush posted a patch series to upstream which can fix the issue. Let's merge them in F25, will get the normal fixes after it being merged in upstream, we hopefully can rebase soon in rawhide. This is an urgent fix for F25 since F25 freeze is this week. Signed-off-by: Dave Young <dyoung@redhat.com> Acked-by: Pratyush Anand <panand@redhat.com> Acked-by: Baoquan He <bhe@redhat.com>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From: Pratyush Anand <panand@redhat.com>
|
|
To: ats-kumagai@wm.jp.nec.com
|
|
Subject: [PATCH Makedumpfile 4/4] x86_64: kill some unused initialization
|
|
Date: Mon, 24 Oct 2016 22:18:46 +0530
|
|
Cc: Pratyush Anand <panand@redhat.com>, dyoung@redhat.com,
|
|
kexec@lists.infradead.org, bhe@redhat.com
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset=utf-8
|
|
|
|
VMALLOC_START, VMALLOC_END, MODULES_VADDR and MODULES_END are mo more
|
|
needed for x86_64 now. So, kill their initialization.
|
|
|
|
Signed-off-by: Pratyush Anand <panand@redhat.com>
|
|
---
|
|
arch/x86_64.c | 4 ----
|
|
makedumpfile.h | 2 --
|
|
2 files changed, 6 deletions(-)
|
|
|
|
diff --git a/arch/x86_64.c b/arch/x86_64.c
|
|
index 597cdac36dfc..13990cef839b 100644
|
|
--- a/makedumpfile-1.6.0/arch/x86_64.c
|
|
+++ b/makedumpfile-1.6.0/arch/x86_64.c
|
|
@@ -169,13 +169,9 @@ get_versiondep_info_x86_64(void)
|
|
return FALSE;
|
|
|
|
if (info->kernel_version < KERNEL_VERSION(2, 6, 31)) {
|
|
- info->vmalloc_start = VMALLOC_START_ORIG;
|
|
- info->vmalloc_end = VMALLOC_END_ORIG;
|
|
info->vmemmap_start = VMEMMAP_START_ORIG;
|
|
info->vmemmap_end = VMEMMAP_END_ORIG;
|
|
} else {
|
|
- info->vmalloc_start = VMALLOC_START_2_6_31;
|
|
- info->vmalloc_end = VMALLOC_END_2_6_31;
|
|
info->vmemmap_start = VMEMMAP_START_2_6_31;
|
|
info->vmemmap_end = VMEMMAP_END_2_6_31;
|
|
}
|
|
diff --git a/makedumpfile.h b/makedumpfile.h
|
|
index 8a96da1f61bd..338c651388f0 100644
|
|
--- a/makedumpfile-1.6.0/makedumpfile.h
|
|
+++ b/makedumpfile-1.6.0/makedumpfile.h
|
|
@@ -575,8 +575,6 @@ int get_va_bits_arm64(void);
|
|
#define __START_KERNEL_map (0xffffffff80000000)
|
|
#define KERNEL_IMAGE_SIZE_ORIG (0x0000000008000000) /* 2.6.25, or former */
|
|
#define KERNEL_IMAGE_SIZE_2_6_26 (0x0000000020000000) /* 2.6.26, or later */
|
|
-#define MODULES_VADDR (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
|
|
-#define MODULES_END (0xfffffffffff00000)
|
|
#define KVBASE PAGE_OFFSET
|
|
#define _SECTION_SIZE_BITS (27)
|
|
#define _MAX_PHYSMEM_BITS_ORIG (40)
|
|
--
|
|
2.7.4
|
|
|
|
|
|
_______________________________________________
|
|
kexec mailing list
|
|
kexec@lists.infradead.org
|
|
http://lists.infradead.org/mailman/listinfo/kexec
|