From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c42C7-0008Ou-AI for kexec@lists.infradead.org; Tue, 08 Nov 2016 08:55:52 +0000 From: Baoquan He Subject: [PATCH 2/2] makedumpfile: Clean up unused KERNEL_IMAGE_SIZE Date: Tue, 8 Nov 2016 16:55:19 +0800 Message-Id: <1478595319-9299-3-git-send-email-bhe@redhat.com> In-Reply-To: <1478595319-9299-1-git-send-email-bhe@redhat.com> References: <1478595319-9299-1-git-send-email-bhe@redhat.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: ats-kumagai@wm.jp.nec.com Cc: panand@redhat.com, Baoquan He , kexec@lists.infradead.org, anderson@redhat.com, ebiederm@xmission.com, tglx@linutronix.de, dyoung@redhat.com The old MODULES_VADDR need be decided by KERNEL_IMAGE_SIZE when kaslr enabled. Now MODULES_VADDR is not needed any more since Pratyush makes all VA to PA converting done by page table lookup. So remove its related code. Signed-off-by: Baoquan He --- makedumpfile.c | 11 +---------- makedumpfile.h | 3 --- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/makedumpfile.c b/makedumpfile.c index a3f711e..1c95306 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -1994,14 +1994,7 @@ get_value_for_old_linux(void) NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) = PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version; } -#ifdef __x86_64__ - if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) { - if (info->kernel_version < KERNEL_VERSION(2, 6, 26)) - NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG; - else - NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26; - } -#endif + if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) { if (info->kernel_version >= KERNEL_VERSION(2, 6, 27)) SIZE(pageflags) = @@ -2258,7 +2251,6 @@ write_vmcoreinfo_data(void) WRITE_NUMBER("PG_hwpoison", PG_hwpoison); WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE); - WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE); WRITE_NUMBER("phys_base", phys_base); WRITE_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR); @@ -2606,7 +2598,6 @@ read_vmcoreinfo(void) READ_SRCFILE("pud_t", pud_t); READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE); - READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE); READ_NUMBER("phys_base", phys_base); READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR); diff --git a/makedumpfile.h b/makedumpfile.h index 422b6be..b627e32 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -573,8 +573,6 @@ int get_va_bits_arm64(void); #define VMEMMAP_END_2_6_31 (0xffffeaffffffffff) /* 2.6.31, or later */ #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 KVBASE PAGE_OFFSET #define _SECTION_SIZE_BITS (27) #define _MAX_PHYSMEM_BITS_ORIG (40) @@ -1713,7 +1711,6 @@ struct number_table { long PG_hwpoison; long PAGE_BUDDY_MAPCOUNT_VALUE; - long KERNEL_IMAGE_SIZE; long SECTION_SIZE_BITS; long MAX_PHYSMEM_BITS; long HUGETLB_PAGE_DTOR; -- 2.5.5 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec