[Xen-changelog] [xen-unstable] VT-d: get rid of duplicated definition

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1265917875 0
# Node ID 9a9ea52c3680f5575cc0401385bcbe9dcd0e061f
# Parent  b882c558d4e4d084eb5532e8feb5944d03c2878f
VT-d: get rid of duplicated definition

free_pgtable_maddr was implemented the same for x86 and IA64, so it's
not necessary to define it separately for x86 and IA64. This patch
moves free_pgtable_maddr definition to iommu.c to avoid duplicated
definition.

Signed-off-by: Weidong Han <weidong.han@xxxxxxxxx>
---
 xen/drivers/passthrough/vtd/ia64/vtd.c |    6 ------
 xen/drivers/passthrough/vtd/iommu.c    |    6 ++++++
 xen/drivers/passthrough/vtd/x86/vtd.c  |    6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff -r b882c558d4e4 -r 9a9ea52c3680 xen/drivers/passthrough/vtd/ia64/vtd.c
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c    Thu Feb 11 19:50:42 2010 +0000
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c    Thu Feb 11 19:51:15 2010 +0000
@@ -44,12 +44,6 @@ void unmap_vtd_domain_page(void *va)
 void unmap_vtd_domain_page(void *va)
 {
     unmap_domain_page(va);
-}
-
-void free_pgtable_maddr(u64 maddr)
-{
-    if ( maddr != 0 )
-        free_domheap_page(maddr_to_page(maddr));
 }
 
 unsigned int get_cache_line_size(void)
diff -r b882c558d4e4 -r 9a9ea52c3680 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c       Thu Feb 11 19:50:42 2010 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c       Thu Feb 11 19:51:15 2010 +0000
@@ -191,6 +191,12 @@ u64 alloc_pgtable_maddr(struct acpi_drhd
     }
 
     return page_to_maddr(pg);
+}
+
+void free_pgtable_maddr(u64 maddr)
+{
+    if ( maddr != 0 )
+        free_domheap_page(maddr_to_page(maddr));
 }
 
 /* context entry handling */
diff -r b882c558d4e4 -r 9a9ea52c3680 xen/drivers/passthrough/vtd/x86/vtd.c
--- a/xen/drivers/passthrough/vtd/x86/vtd.c     Thu Feb 11 19:50:42 2010 +0000
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c     Thu Feb 11 19:51:15 2010 +0000
@@ -42,12 +42,6 @@ void unmap_vtd_domain_page(void *va)
 void unmap_vtd_domain_page(void *va)
 {
     unmap_domain_page(va);
-}
-
-void free_pgtable_maddr(u64 maddr)
-{
-    if ( maddr != 0 )
-        free_domheap_page(maddr_to_page(maddr));
 }
 
 unsigned int get_cache_line_size(void)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog