[dpdk-dev,2/3] lib/xen:DPDK dom0 Driver change

Message ID 1421991340-21960-3-git-send-email-jijiang.liu@intel.com (mailing list archive)
State Changes Requested, archived
Headers

Commit Message

Jijiang Liu Jan. 23, 2015, 5:35 a.m. UTC
  Fixed all the compilation issues due to using SUSE Linux 11 SP3.

Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
---
 lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
  

Patch

diff --git a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
index 543bf57..2715826 100644
--- a/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
+++ b/lib/librte_eal/linuxapp/xen_dom0/dom0_mm_misc.c
@@ -67,7 +67,7 @@ 
 #include <linux/version.h>
 
 #include <xen/xen.h>
-#include <xen/page.h>
+#include <asm/uaccess.h>
 #include <xen/xen-ops.h>
 #include <xen/interface/memory.h>
 
@@ -392,7 +392,7 @@  find_memseg(int count, struct dom0_mm_data * mm_data)
 static int
 dom0_memory_reserve(uint32_t rsv_size)
 {
-	uint64_t pfn, vstart, vaddr;
+	uint64_t pfn, mfn, vstart, vaddr;
 	uint32_t i, num_block, size, allocated_size = 0;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
@@ -429,7 +429,8 @@  dom0_memory_reserve(uint32_t rsv_size)
 			size -= PAGE_SIZE;
 		}
 
-		pfn = virt_to_pfn(vstart);
+		mfn = virt_to_mfn(vstart);
+		pfn = mfn_to_pfn(mfn);
 		rsv_mm_info[i].pfn = pfn;
 		rsv_mm_info[i].vir_addr = vstart;
 		rsv_mm_info[i + 1].pfn =
@@ -457,7 +458,8 @@  dom0_memory_reserve(uint32_t rsv_size)
 			vaddr += PAGE_SIZE;
 			size -= PAGE_SIZE;
 		}
-		pfn = virt_to_pfn(vstart);
+		mfn = virt_to_mfn(vstart);
+		pfn = mfn_to_pfn(mfn);
 		rsv_mm_info[i].pfn = pfn;
 		rsv_mm_info[i].vir_addr = vstart;
 	}