Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3b4ae79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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
parents 4dd61d92 b4e0f9eb

drivers/pci/intel-iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

		}

	}