summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-26 17:01:04 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-26 19:48:15 +1000
commit0999ed7f57728c1919b131207e47d9b311cfbd74 (patch)
tree2264f1cb9a5aded6297f2481f6f54b6aa860aaa1
parentc78f830547087aa4143affd3404a854995603544 (diff)
downloadblackbird-op-linux-0999ed7f57728c1919b131207e47d9b311cfbd74.tar.gz
blackbird-op-linux-0999ed7f57728c1919b131207e47d9b311cfbd74.zip
Revert "[POWERPC] DMA 4GB boundary protection"
This reverts commit 618d3adc351a24c4c48437c767befb88ca2d199d, because it is superseded by 569975591c5530fdc9c7a3c45122e5e46f075a74.
-rw-r--r--arch/powerpc/kernel/iommu.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index d2598e2e7bbe..c08ceca6277d 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -89,7 +89,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
unsigned int align_order)
{
unsigned long n, end, i, start;
- unsigned long start_addr, end_addr;
unsigned long limit;
int largealloc = npages > 15;
int pass = 0;
@@ -160,15 +159,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
}
}
- /* DMA cannot cross 4 GB boundary */
- start_addr = (n + tbl->it_offset) << PAGE_SHIFT;
- end_addr = (end + tbl->it_offset) << PAGE_SHIFT;
- if ((start_addr >> 32) != (end_addr >> 32)) {
- end_addr &= 0xffffffff00000000l;
- start = (end_addr >> PAGE_SHIFT) - tbl->it_offset;
- goto again;
- }
-
for (i = n; i < end; i++)
if (test_bit(i, tbl->it_map)) {
start = i+1;
OpenPOWER on IntegriCloud