[PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
Gerard Snitselaar
dev at snitselaar.org
Thu Jul 12 17:05:34 EST 2012
Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open
coded assembly) got a rejected merge file iommu.c.rej committed with
it.
Signed-off-by: Gerard Snitselaar <dev at snitselaar.org>
---
arch/powerpc/kernel/iommu.c.rej | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 arch/powerpc/kernel/iommu.c.rej
diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej
deleted file mode 100644
index 9d10d34..0000000
--- a/arch/powerpc/kernel/iommu.c.rej
+++ /dev/null
@@ -1,22 +0,0 @@
---- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000
-+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000
-@@ -33,7 +33,9 @@
- #include <linux/bitmap.h>
- #include <linux/iommu-helper.h>
- #include <linux/crash_dump.h>
-+#include <linux/fault-inject.h>
- #include <asm/io.h>
-+#include <asm/vio.h>
- #include <asm/prom.h>
- #include <asm/iommu.h>
- #include <asm/pci-bridge.h>
-@@ -171,6 +261,9 @@
- return DMA_ERROR_CODE;
- }
-
-+ if (should_fail_iommu(dev))
-+ return DMA_ERROR_CODE;
-+
- if (handle && *handle)
- start = *handle;
- else
--
1.7.11.1.165.g299666c
More information about the Linuxppc-dev
mailing list