Blame SOURCES/kexec-tools-2.0.14-makedumpfile-makedumpfile-Discard-process_dump_load.patch

766e0d
From f3ff8c6232de43fa2cc60f5ca0f233cf8eb8d2ad Mon Sep 17 00:00:00 2001
766e0d
Message-Id: <f3ff8c6232de43fa2cc60f5ca0f233cf8eb8d2ad.1489471500.git.panand@redhat.com>
766e0d
In-Reply-To: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
766e0d
References: <4b0bed3523a5f6c2c428d9dab3d27d4572207d52.1489471500.git.panand@redhat.com>
766e0d
From: Baoquan He <bhe@redhat.com>
766e0d
Date: Thu, 2 Mar 2017 17:37:23 +0900
766e0d
Subject: [PATCH 6/7] [PATCH v3 6/7] makedumpfile: Discard process_dump_load
766e0d
766e0d
Kernel commit 464920104bf7 (/proc/kcore: update physical address for
766e0d
kcore ram and text) provides physical address of direct mapping kcore
766e0d
program segments. So no need to calculate it specifically now. And the
766e0d
old code is not correct since it calls vaddr_to_paddr() which has not
766e0d
been ready at that time.
766e0d
766e0d
Signed-off-by: Baoquan He <bhe@redhat.com>
766e0d
---
766e0d
 elf_info.c | 17 -----------------
766e0d
 1 file changed, 17 deletions(-)
766e0d
766e0d
diff --git a/makedumpfile-1.6.1/elf_info.c b/makedumpfile-1.6.1/elf_info.c
766e0d
index 100272f83c48..8e2437622141 100644
766e0d
--- a/makedumpfile-1.6.1/elf_info.c
766e0d
+++ b/makedumpfile-1.6.1/elf_info.c
766e0d
@@ -857,22 +857,6 @@ static int exclude_segment(struct pt_load_segment **pt_loads,
766e0d
 	return 0;
766e0d
 }
766e0d
 
766e0d
-static int
766e0d
-process_dump_load(struct pt_load_segment	*pls)
766e0d
-{
766e0d
-	unsigned long long paddr;
766e0d
-
766e0d
-	paddr = vaddr_to_paddr(pls->virt_start);
766e0d
-	pls->phys_start  = paddr;
766e0d
-	pls->phys_end    = paddr + (pls->virt_end - pls->virt_start);
766e0d
-	DEBUG_MSG("process_dump_load\n");
766e0d
-	DEBUG_MSG("  phys_start : %llx\n", pls->phys_start);
766e0d
-	DEBUG_MSG("  phys_end   : %llx\n", pls->phys_end);
766e0d
-	DEBUG_MSG("  virt_start : %llx\n", pls->virt_start);
766e0d
-	DEBUG_MSG("  virt_end   : %llx\n", pls->virt_end);
766e0d
-
766e0d
-	return TRUE;
766e0d
-}
766e0d
 
766e0d
 int get_kcore_dump_loads(void)
766e0d
 {
766e0d
@@ -917,7 +901,6 @@ int get_kcore_dump_loads(void)
766e0d
 		}
766e0d
 
766e0d
 		pls[j] = *p;
766e0d
-		process_dump_load(&pls[j]);
766e0d
 		j++;
766e0d
 	}
766e0d
 
766e0d
-- 
766e0d
2.9.3
766e0d