tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
-22
-22
arch/powerpc/kernel/iommu.c.rej
-22
arch/powerpc/kernel/iommu.c.rej
···
1
-
--- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000
2
-
+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000
3
-
@@ -33,7 +33,9 @@
4
-
#include <linux/bitmap.h>
5
-
#include <linux/iommu-helper.h>
6
-
#include <linux/crash_dump.h>
7
-
+#include <linux/fault-inject.h>
8
-
#include <asm/io.h>
9
-
+#include <asm/vio.h>
10
-
#include <asm/prom.h>
11
-
#include <asm/iommu.h>
12
-
#include <asm/pci-bridge.h>
13
-
@@ -171,6 +261,9 @@
14
-
return DMA_ERROR_CODE;
15
-
}
16
-
17
-
+ if (should_fail_iommu(dev))
18
-
+ return DMA_ERROR_CODE;
19
-
+
20
-
if (handle && *handle)
21
-
start = *handle;
22
-
else