summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-23 09:38:53 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-23 09:38:53 +1000
commit668fcb6972177489bdc01a66d697c3b494aa8a24 (patch)
tree063e06a1a61fb975950ae3b9123aca0a5411e14e /arch/powerpc/kernel
parentdcd261ba58d7a49f4624b34b3bd2d535f63643a2 (diff)
downloadblackbird-op-linux-668fcb6972177489bdc01a66d697c3b494aa8a24.tar.gz
blackbird-op-linux-668fcb6972177489bdc01a66d697c3b494aa8a24.zip
Remove stale .rej file
Commit 9778b696a0188ad3b3524b383953ee73b31b7b68 accidentally added a .rej file (probably my fault), remove it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/iommu.c.rej22
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej
deleted file mode 100644
index 9d10d341cf86..000000000000
--- 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
OpenPOWER on IntegriCloud