ia64/xen-unstable

changeset 15964:d17532dc1725

Fix the build after AMD IOMMU patches.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Sun Sep 23 12:56:11 2007 +0100 (2007-09-23)
parents 4fdcea9881b2
children 6ab8580e6855 c0d1825f5189
files xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c
line diff
     1.1 --- a/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c	Sun Sep 23 12:55:50 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c	Sun Sep 23 12:56:11 2007 +0100
     1.3 @@ -103,7 +103,7 @@ int __init get_iommu_capabilities(u8 bus
     1.4  
     1.5      if ( (mmio_bar == 0) || ( (mmio_bar & 0x3FFF) != 0 ) ) {
     1.6          dprintk(XENLOG_ERR ,
     1.7 -            "AMD IOMMU: Invalid MMIO_BAR = 0x%lx\n", mmio_bar);
     1.8 +                "AMD IOMMU: Invalid MMIO_BAR = 0x%"PRIx64"\n", mmio_bar);
     1.9          return -ENODEV;
    1.10      }
    1.11  
     2.1 --- a/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c	Sun Sep 23 12:55:50 2007 +0100
     2.2 +++ b/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c	Sun Sep 23 12:56:11 2007 +0100
     2.3 @@ -224,8 +224,8 @@ struct amd_iommu *find_iommu_for_device(
     2.4      return NULL;
     2.5  }
     2.6  
     2.7 -void amd_iommu_setup_domain_device(struct domain *domain,
     2.8 -        struct amd_iommu *iommu, int requestor_id)
     2.9 +void amd_iommu_setup_domain_device(
    2.10 +    struct domain *domain, struct amd_iommu *iommu, int requestor_id)
    2.11  {
    2.12      void *dte;
    2.13      u64 root_ptr;
    2.14 @@ -244,8 +244,8 @@ void amd_iommu_setup_domain_device(struc
    2.15          root_ptr, hd->domain_id, hd->paging_mode);
    2.16  
    2.17      dprintk(XENLOG_INFO, "AMD IOMMU: Set DTE req_id:%x, "
    2.18 -        "root_ptr:%lx, domain_id:%d, paging_mode:%d\n",
    2.19 -        requestor_id, root_ptr, hd->domain_id, hd->paging_mode);
    2.20 +            "root_ptr:%"PRIx64", domain_id:%d, paging_mode:%d\n",
    2.21 +            requestor_id, root_ptr, hd->domain_id, hd->paging_mode);
    2.22  
    2.23      spin_unlock_irqrestore(&iommu->lock, flags);
    2.24  }