# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1192552588 -3600
# Node ID 96930bc060a697a47e370615a31df398ca0425cb
# Parent 9488d31665538a815541109cd2da94adec291bbc
Clean up a little bit after the TLB/cache-flush changes.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/hvm/vmx/vtd/intel-iommu.c | 8 ++++----
xen/include/asm-x86/flushtlb.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff -r 9488d3166553 -r 96930bc060a6 xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
--- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c Tue Oct 16 17:31:37 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c Tue Oct 16 17:36:28 2007 +0100
@@ -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 -r 9488d3166553 -r 96930bc060a6 xen/include/asm-x86/flushtlb.h
--- a/xen/include/asm-x86/flushtlb.h Tue Oct 16 17:31:37 2007 +0100
+++ b/xen/include/asm-x86/flushtlb.h Tue Oct 16 17:36:28 2007 +0100
@@ -104,13 +104,13 @@ void flush_area_mask(cpumask_t, const vo
#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() \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home