fixing some patch fuzz

This commit is contained in:
Neil Horman 2008-07-14 15:31:29 +00:00
parent b4a96a8bbc
commit 99ee15683c

View File

@ -1,7 +1,7 @@
diff -up kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig kexec-tools-testing-20070330/makedumpfile/x86_64.c
--- kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig 2008-04-10 11:59:09.000000000 -0400
+++ kexec-tools-testing-20070330/makedumpfile/x86_64.c 2008-04-10 11:59:52.000000000 -0400
@@ -71,12 +71,11 @@ vaddr_to_offset_x86_64(unsigned long vad
--- kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig 2008-06-05 01:30:57.000000000 -0400
+++ kexec-tools-testing-20070330/makedumpfile/x86_64.c 2008-07-14 11:30:05.000000000 -0400
@@ -148,12 +148,11 @@ vaddr_to_offset_x86_64(unsigned long vad
struct pt_load_segment *pls;
/*
@ -16,5 +16,5 @@ diff -up kexec-tools-testing-20070330/makedumpfile/x86_64.c.orig kexec-tools-tes
- phys_base = 0;
+ phys_base = info->phys_base;
if (vaddr >= __START_KERNEL_map)
paddr = vaddr - __START_KERNEL_map + phys_base;
if (is_vmalloc_addr(vaddr)) {
if ((paddr = vtop4_x86_64(vaddr)) == NOT_PADDR) {