# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1190548571 -3600
# Node ID d17532dc1725e58b787329f64ce2e4e0e79516f0
# Parent 4fdcea9881b24a76c23c8b12b12cf3b66cba4a33
Fix the build after AMD IOMMU patches.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c | 2 +-
xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff -r 4fdcea9881b2 -r d17532dc1725
xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c
--- a/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c Sun Sep 23 12:55:50
2007 +0100
+++ b/xen/arch/x86/hvm/svm/amd_iommu/amd-iommu-detect.c Sun Sep 23 12:56:11
2007 +0100
@@ -103,7 +103,7 @@ int __init get_iommu_capabilities(u8 bus
if ( (mmio_bar == 0) || ( (mmio_bar & 0x3FFF) != 0 ) ) {
dprintk(XENLOG_ERR ,
- "AMD IOMMU: Invalid MMIO_BAR = 0x%lx\n", mmio_bar);
+ "AMD IOMMU: Invalid MMIO_BAR = 0x%"PRIx64"\n", mmio_bar);
return -ENODEV;
}
diff -r 4fdcea9881b2 -r d17532dc1725
xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c
--- a/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c Sun Sep 23 12:55:50
2007 +0100
+++ b/xen/arch/x86/hvm/svm/amd_iommu/pci-amd-iommu.c Sun Sep 23 12:56:11
2007 +0100
@@ -224,8 +224,8 @@ struct amd_iommu *find_iommu_for_device(
return NULL;
}
-void amd_iommu_setup_domain_device(struct domain *domain,
- struct amd_iommu *iommu, int requestor_id)
+void amd_iommu_setup_domain_device(
+ struct domain *domain, struct amd_iommu *iommu, int requestor_id)
{
void *dte;
u64 root_ptr;
@@ -244,8 +244,8 @@ void amd_iommu_setup_domain_device(struc
root_ptr, hd->domain_id, hd->paging_mode);
dprintk(XENLOG_INFO, "AMD IOMMU: Set DTE req_id:%x, "
- "root_ptr:%lx, domain_id:%d, paging_mode:%d\n",
- requestor_id, root_ptr, hd->domain_id, hd->paging_mode);
+ "root_ptr:%"PRIx64", domain_id:%d, paging_mode:%d\n",
+ requestor_id, root_ptr, hd->domain_id, hd->paging_mode);
spin_unlock_irqrestore(&iommu->lock, flags);
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home