rt_patches: required rebase due to printk change

[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0296-iommu-amd-Use-WARN_ON_NORT-in-__attach_device.patch

diff --git a/rt-patches/0296-iommu-amd-Use-WARN_ON_NORT-in-__attach_device.patch b/rt-patches/0296-iommu-amd-Use-WARN_ON_NORT-in-__attach_device.patch
index ad794453ea1f80e50057dfd4689623af360a4474..10aeb23dafd65f50d5b543efed3d11072b4ac9eb 100644 (file)
--- a/rt-patches/0296-iommu-amd-Use-WARN_ON_NORT-in-__attach_device.patch
+++ b/rt-patches/0296-iommu-amd-Use-WARN_ON_NORT-in-__attach_device.patch
@@ -1,7 +1,7 @@
-From 63a8be65b593441a9ad374a23ac63ba447bfa71c Mon Sep 17 00:00:00 2001
+From 92ab99ab40e0f2956c75dcd8c7da1ce757624115 Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Sat, 27 Feb 2016 10:22:23 +0100
-Subject: [PATCH 296/365] iommu/amd: Use WARN_ON_NORT in __attach_device()
+Subject: [PATCH 296/366] iommu/amd: Use WARN_ON_NORT in __attach_device()
 
 RT does not disable interrupts here, but the protection is still
 correct. Fixup the WARN_ON so it won't yell on RT.
@@ -48,5 +48,5 @@ index 5975d76..c8fc4c6 100644
        if (WARN_ON(!dev_data->domain))
                return;
 -- 
-2.7.4
+1.9.1