Commit b4e0f9eb authored Nov 19, 2008 by FUJITA Tomonori Committed by Ingo Molnar Nov 19, 2008

intel-iommu: fix compile warnings



Impact: cleanup

I got the following warnings on IA64:

  linux-2.6/drivers/pci/intel-iommu.c: In function 'init_dmars':
  linux-2.6/drivers/pci/intel-iommu.c:1658: warning: format '%Lx' expects type 'long long unsigned int', but argument 2 has type 'u64'
  linux-2.6/drivers/pci/intel-iommu.c:1663: warning: format '%Lx' expects type 'long long unsigned int', but argument 2 has type 'u64'

Another victim of int-ll64.h versus int-l64.h confusion between platforms.

->reg_base_addr has a type of u64 - which can only be printed out
consistently if we cast its type up to LL.

[ Eventually reg_base_addr should be converted to phys_addr_t, for which
  we have the %pR printk helper - but that is out of the scope of late
  -rc's. ]

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 7f0f598a

drivers/pci/intel-iommu.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1655,12 +1655,14 @@ int __init init_dmars(void)
	iommu->flush.flush_context = __iommu_flush_context;		iommu->flush.flush_context = __iommu_flush_context;
	iommu->flush.flush_iotlb = __iommu_flush_iotlb;		iommu->flush.flush_iotlb = __iommu_flush_iotlb;
	printk(KERN_INFO "IOMMU 0x%Lx: using Register based "		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 {		} else {
	iommu->flush.flush_context = qi_flush_context;		iommu->flush.flush_context = qi_flush_context;
	iommu->flush.flush_iotlb = qi_flush_iotlb;		iommu->flush.flush_iotlb = qi_flush_iotlb;
	printk(KERN_INFO "IOMMU 0x%Lx: using Queued "		printk(KERN_INFO "IOMMU 0x%Lx: using Queued "
	"invalidation\n", drhd->reg_base_addr);		"invalidation\n",
			(unsigned long long)drhd->reg_base_addr);
	}		}
	}		}