diff options
author | Ravikiran G Thirumalai <kiran@scalex86.org> | 2006-01-06 03:11:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:26 -0500 |
commit | 008857c1a49ccffc31a54c3ea7e182833bd61304 (patch) | |
tree | ba65452db097f57e05d2e3df550d55d45feabc94 /lib/swiotlb.c | |
parent | 085cc7d5de3cc662da7ea78296464a0d52f3f01f (diff) |
[PATCH] Cleanup bootmem allocator and fix alloc_bootmem_low
Patch cleans up the alloc_bootmem fix for swiotlb. Patch removes
alloc_bootmem_*_limit api and fixes alloc_boot_*low api to do the right
thing -- allocate from low32 memory.
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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); |