diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:03 -0800 |
| commit | e3b4ae79e91447bbd883df12d52ef2be9b12be61 (patch) | |
| tree | 289524772e67e1dab0d257917b124b4c8efb14e6 | |
| parent | 4dd61d92d7204788b93b064a679c9068fc5b8a5f (diff) | |
| parent | b4e0f9eb8aeceb22c48fee005378bd19e25216fc (diff) | |
| download | linux-3.10-e3b4ae79e91447bbd883df12d52ef2be9b12be61.tar.gz linux-3.10-e3b4ae79e91447bbd883df12d52ef2be9b12be61.tar.bz2 linux-3.10-e3b4ae79e91447bbd883df12d52ef2be9b12be61.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
intel-iommu: fix compile warnings
| -rw-r--r-- | drivers/pci/intel-iommu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index a2692724b68..5c8baa43ac9 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -1655,12 +1655,14 @@ int __init init_dmars(void) iommu->flush.flush_context = __iommu_flush_context; iommu->flush.flush_iotlb = __iommu_flush_iotlb; printk(KERN_INFO "IOMMU 0x%Lx: using Register based " - "invalidation\n", drhd->reg_base_addr); + "invalidation\n", + (unsigned long long)drhd->reg_base_addr); } else { iommu->flush.flush_context = qi_flush_context; iommu->flush.flush_iotlb = qi_flush_iotlb; printk(KERN_INFO "IOMMU 0x%Lx: using Queued " - "invalidation\n", drhd->reg_base_addr); + "invalidation\n", + (unsigned long long)drhd->reg_base_addr); } } |