1.1 --- a/xen/drivers/passthrough/vtd/iommu.c	Mon Jan 10 10:32:04 2011 +0000
     1.2 +++ b/xen/drivers/passthrough/vtd/iommu.c	Mon Jan 10 10:37:53 2011 +0000
     1.3 @@ -389,7 +389,7 @@ static int flush_context_reg(
     1.4      return 0;
     1.5  }
     1.6  
     1.7 -static int inline iommu_flush_context_global(
     1.8 +static int iommu_flush_context_global(
     1.9      struct iommu *iommu, int flush_non_present_entry)
    1.10  {
    1.11      struct iommu_flush *flush = iommu_get_flush(iommu);
    1.12 @@ -397,15 +397,7 @@ static int inline iommu_flush_context_gl
    1.13                                   flush_non_present_entry);
    1.14  }
    1.15  
    1.16 -static int inline iommu_flush_context_domain(
    1.17 -    struct iommu *iommu, u16 did, int flush_non_present_entry)
    1.18 -{
    1.19 -    struct iommu_flush *flush = iommu_get_flush(iommu);
    1.20 -    return flush->context(iommu, did, 0, 0, DMA_CCMD_DOMAIN_INVL,
    1.21 -                                 flush_non_present_entry);
    1.22 -}
    1.23 -
    1.24 -static int inline iommu_flush_context_device(
    1.25 +static int iommu_flush_context_device(
    1.26      struct iommu *iommu, u16 did, u16 source_id,
    1.27      u8 function_mask, int flush_non_present_entry)
    1.28  {
    1.29 @@ -482,7 +474,7 @@ static int flush_iotlb_reg(void *_iommu,
    1.30      return 0;
    1.31  }
    1.32  
    1.33 -static int inline iommu_flush_iotlb_global(struct iommu *iommu,
    1.34 +static int iommu_flush_iotlb_global(struct iommu *iommu,
    1.35      int flush_non_present_entry, int flush_dev_iotlb)
    1.36  {
    1.37      struct iommu_flush *flush = iommu_get_flush(iommu);
    1.38 @@ -500,7 +492,7 @@ static int inline iommu_flush_iotlb_glob
    1.39      return status;
    1.40  }
    1.41  
    1.42 -static int inline iommu_flush_iotlb_dsi(struct iommu *iommu, u16 did,
    1.43 +static int iommu_flush_iotlb_dsi(struct iommu *iommu, u16 did,
    1.44      int flush_non_present_entry, int flush_dev_iotlb)
    1.45  {
    1.46      struct iommu_flush *flush = iommu_get_flush(iommu);
    1.47 @@ -518,7 +510,7 @@ static int inline iommu_flush_iotlb_dsi(
    1.48      return status;
    1.49  }
    1.50  
    1.51 -static int inline iommu_flush_iotlb_psi(
    1.52 +static int iommu_flush_iotlb_psi(
    1.53      struct iommu *iommu, u16 did, u64 addr, unsigned int order,
    1.54      int flush_non_present_entry, int flush_dev_iotlb)
    1.55  {