diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-26 03:01:04 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 05:48:15 -0400 |
commit | 0999ed7f57728c1919b131207e47d9b311cfbd74 (patch) | |
tree | 2264f1cb9a5aded6297f2481f6f54b6aa860aaa1 /arch | |
parent | c78f830547087aa4143affd3404a854995603544 (diff) |
Revert "[POWERPC] DMA 4GB boundary protection"
This reverts commit 618d3adc351a24c4c48437c767befb88ca2d199d, because
it is superseded by 569975591c5530fdc9c7a3c45122e5e46f075a74.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/iommu.c | 10 |
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, | |||
89 | unsigned int align_order) | 89 | unsigned int align_order) |
90 | { | 90 | { |
91 | unsigned long n, end, i, start; | 91 | unsigned long n, end, i, start; |
92 | unsigned long start_addr, end_addr; | ||
93 | unsigned long limit; | 92 | unsigned long limit; |
94 | int largealloc = npages > 15; | 93 | int largealloc = npages > 15; |
95 | int pass = 0; | 94 | int pass = 0; |
@@ -160,15 +159,6 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl, | |||
160 | } | 159 | } |
161 | } | 160 | } |
162 | 161 | ||
163 | /* DMA cannot cross 4 GB boundary */ | ||
164 | start_addr = (n + tbl->it_offset) << PAGE_SHIFT; | ||
165 | end_addr = (end + tbl->it_offset) << PAGE_SHIFT; | ||
166 | if ((start_addr >> 32) != (end_addr >> 32)) { | ||
167 | end_addr &= 0xffffffff00000000l; | ||
168 | start = (end_addr >> PAGE_SHIFT) - tbl->it_offset; | ||
169 | goto again; | ||
170 | } | ||
171 | |||
172 | for (i = n; i < end; i++) | 162 | for (i = n; i < end; i++) |
173 | if (test_bit(i, tbl->it_map)) { | 163 | if (test_bit(i, tbl->it_map)) { |
174 | start = i+1; | 164 | start = i+1; |