- intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running fix
has been removed from the -mm tree.  Its filename was
     intel-iommu-make-intel-iommu_wait_op-work-when-jiffies-arent-running-fix.patch

This patch was dropped because it was merged into mainline or a subsystem tree

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

origin.patch
linux-next.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux