diff options
Diffstat (limited to 'arch/powerpc/kernel/iommu.c.rej')
| -rw-r--r-- | arch/powerpc/kernel/iommu.c.rej | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej new file mode 100644 index 000000000000..9d10d341cf86 --- /dev/null +++ b/arch/powerpc/kernel/iommu.c.rej | |||
| @@ -0,0 +1,22 @@ | |||
| 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 | ||