ia64/xen-unstable

changeset 16025:96895c637d27

x86: Fix debug build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Mon Oct 01 09:32:04 2007 +0100 (2007-10-01)
parents 5c7afb32df99
children b3814860d170
files xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
line diff
     1.1 --- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c	Mon Oct 01 06:39:00 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c	Mon Oct 01 09:32:04 2007 +0100
     1.3 @@ -173,7 +173,7 @@ static struct page_info *addr_to_dma_pag
     1.4          if ( dma_pte_addr(*pte) == 0 )
     1.5          {
     1.6              pg = alloc_domheap_page(NULL);
     1.7 -            vaddr = map_domain_page(mfn_x(page_to_mfn(pg)));
     1.8 +            vaddr = map_domain_page(page_to_mfn(pg));
     1.9              if ( !vaddr )
    1.10              {
    1.11                  spin_unlock_irqrestore(&hd->mapping_lock, flags);
    1.12 @@ -195,7 +195,7 @@ static struct page_info *addr_to_dma_pag
    1.13          else
    1.14          {
    1.15              pg = maddr_to_page(pte->val);
    1.16 -            vaddr = map_domain_page(mfn_x(page_to_mfn(pg)));
    1.17 +            vaddr = map_domain_page(page_to_mfn(pg));
    1.18              if ( !vaddr )
    1.19              {
    1.20                  spin_unlock_irqrestore(&hd->mapping_lock, flags);
    1.21 @@ -250,7 +250,7 @@ static struct page_info *dma_addr_level_
    1.22          if ( level == total )
    1.23              return pg;
    1.24  
    1.25 -        parent = map_domain_page(mfn_x(page_to_mfn(pg)));
    1.26 +        parent = map_domain_page(page_to_mfn(pg));
    1.27          total--;
    1.28      }
    1.29  
    1.30 @@ -542,7 +542,7 @@ static void dma_pte_clear_one(struct dom
    1.31      pg = dma_addr_level_page(domain, addr, 1);
    1.32      if ( !pg )
    1.33          return;
    1.34 -    pte = (struct dma_pte *)map_domain_page(mfn_x(page_to_mfn(pg)));
    1.35 +    pte = (struct dma_pte *)map_domain_page(page_to_mfn(pg));
    1.36      pte += address_level_offset(addr, 1);
    1.37      if ( pte )
    1.38      {
    1.39 @@ -612,7 +612,7 @@ void dma_pte_free_pagetable(struct domai
    1.40              pg = dma_addr_level_page(domain, tmp, level);
    1.41              if ( !pg )
    1.42                  return;
    1.43 -            pte = (struct dma_pte *)map_domain_page(mfn_x(page_to_mfn(pg)));
    1.44 +            pte = (struct dma_pte *)map_domain_page(page_to_mfn(pg));
    1.45              pte += address_level_offset(tmp, level);
    1.46              dma_clear_pte(*pte);
    1.47              iommu_flush_cache_entry(iommu, pte);
    1.48 @@ -1493,7 +1493,7 @@ int iommu_map_page(struct domain *d, pad
    1.49      pg = addr_to_dma_page(d, gfn << PAGE_SHIFT_4K);
    1.50      if ( !pg )
    1.51          return -ENOMEM;
    1.52 -    pte = (struct dma_pte *)map_domain_page(mfn_x(page_to_mfn(pg)));
    1.53 +    pte = (struct dma_pte *)map_domain_page(page_to_mfn(pg));
    1.54      pte += mfn & LEVEL_MASK;
    1.55      dma_set_pte_addr(*pte, mfn << PAGE_SHIFT_4K);
    1.56      dma_set_pte_prot(*pte, DMA_PTE_READ | DMA_PTE_WRITE);
    1.57 @@ -1554,7 +1554,7 @@ int iommu_page_mapping(struct domain *do
    1.58          pg = addr_to_dma_page(domain, iova + PAGE_SIZE_4K * index);
    1.59          if ( !pg )
    1.60              return -ENOMEM;
    1.61 -        pte = (struct dma_pte *)map_domain_page(mfn_x(page_to_mfn(pg)));
    1.62 +        pte = (struct dma_pte *)map_domain_page(page_to_mfn(pg));
    1.63          pte += start_pfn & LEVEL_MASK;
    1.64          dma_set_pte_addr(*pte, start_pfn << PAGE_SHIFT_4K);
    1.65          dma_set_pte_prot(*pte, prot);