Clean up a little bit after the TLB/cache-flush changes.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
index f8e3b09d6837aac60754aa27439484341481febb..b63b0217d0584201bb7122e8947cf102c0236457 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
+++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
@@ -499,7 +499,7 @@ static int inline iommu_flush_iotlb_psi(
                                DMA_TLB_PSI_FLUSH, non_present_entry_flush);
 }
 
-void flush_all(void)
+void iommu_flush_all(void)
 {
     struct acpi_drhd_unit *drhd;
     struct iommu *iommu;
@@ -1775,7 +1775,7 @@ int iommu_setup(void)
     INIT_LIST_HEAD(&hd->pdev_list);
 
     /* start from scratch */
-    flush_all();
+    iommu_flush_all();
 
     /* setup clflush size */
     x86_clflush_size = ((cpuid_ebx(1) >> 8) & 0xff) * 8;
@@ -1958,7 +1958,7 @@ int iommu_suspend(void)
     struct iommu *iommu;
     int i = 0;
 
-    flush_all();
+    iommu_flush_all();
 
     for_each_drhd_unit ( drhd )
     {
@@ -1993,7 +1993,7 @@ int iommu_resume(void)
     struct iommu *iommu;
     int i = 0;
 
-    flush_all();
+    iommu_flush_all();
 
     init_vtd_hw();
     for_each_drhd_unit ( drhd )

diff --git a/xen/include/asm-x86/flushtlb.h b/xen/include/asm-x86/flushtlb.h
index 97a60e6b25e92dcb273227c9b0aa87624447b588..7e67ec23b448e26ff695047e5d5eed250abe592b 100644 (file)
--- a/xen/include/asm-x86/flushtlb.h
+++ b/xen/include/asm-x86/flushtlb.h
@@ -104,13 +104,13 @@ void flush_area_mask(cpumask_t, const void *va, unsigned int flags);
 #define flush_tlb_local()                       \
     flush_local(FLUSH_TLB)
 #define flush_tlb_one_local(v)                  \
-    flush_area_local((const void *)(v), FLUSH_TLB|1)
+    flush_area_local((const void *)(v), FLUSH_TLB|FLUSH_LEVEL(1))
 
 /* Flush specified CPUs' TLBs */
 #define flush_tlb_mask(mask)                    \
     flush_mask(mask, FLUSH_TLB)
 #define flush_tlb_one_mask(mask,v)              \
-    flush_area_mask(mask, (const void *)(v), FLUSH_TLB|1)
+    flush_area_mask(mask, (const void *)(v), FLUSH_TLB|FLUSH_LEVEL(1))
 
 /* Flush all CPUs' TLBs */
 #define flush_tlb_all()                         \