The patch titled intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running fix has been added to the -mm tree. Its filename is intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running fix From: mark gross <mgross@xxxxxxxxxxxxxxx> Think-oh in patch. it works as implemented but the panic line does not need the KERN_ERR string included :( Can you use the following? Signed-off-by: mark gross <mgross@xxxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pci/intel-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/pci/intel-iommu.c~intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix drivers/pci/intel-iommu.c --- a/drivers/pci/intel-iommu.c~intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix +++ a/drivers/pci/intel-iommu.c @@ -496,7 +496,7 @@ static int iommu_alloc_root_entry(struct if (cond)\ break;\ if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\ - panic(KERN_ERR "DMAR hardware is malfunctioning\n");\ + panic("DMAR hardware is malfunctioning\n");\ cpu_relax();\ }\ } _ Patches currently in -mm which might be from mgross@xxxxxxxxxxxxxxx are intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running.patch intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html