rpms/kexec-tools/devel kexec-tools-1.102pre-x86-phys_base.patch, 1.1, 1.2

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8710

Modified Files:
	kexec-tools-1.102pre-x86-phys_base.patch 
Log Message:
fixing some patch fuzz

kexec-tools-1.102pre-x86-phys_base.patch:

Index: kexec-tools-1.102pre-x86-phys_base.patch
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools-1.102pre-x86-phys_base.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec-tools-1.102pre-x86-phys_base.patch	5 Jun 2008 15:18:53 -0000	1.1
+++ kexec-tools-1.102pre-x86-phys_base.patch	14 Jul 2008 15:31:29 -0000	1.2
@@ -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 @@
 -		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) {