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

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