diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /lib/swiotlb.c | |
parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) |
Merge ../torvalds-2.6/
Diffstat (limited to 'lib/swiotlb.c')
-rw-r--r-- | lib/swiotlb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 1ff8dcebf7c6..3b482052f403 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -142,8 +142,7 @@ swiotlb_init_with_default_size (size_t default_size) | |||
142 | /* | 142 | /* |
143 | * Get IO TLB memory from the low pages | 143 | * Get IO TLB memory from the low pages |
144 | */ | 144 | */ |
145 | io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs * | 145 | io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs * (1 << IO_TLB_SHIFT)); |
146 | (1 << IO_TLB_SHIFT), 0x100000000); | ||
147 | if (!io_tlb_start) | 146 | if (!io_tlb_start) |
148 | panic("Cannot allocate SWIOTLB buffer"); | 147 | panic("Cannot allocate SWIOTLB buffer"); |
149 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); | 148 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); |