aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-20 10:06:09 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-20 10:06:09 -0400
commit902f90735b693550eb51a3989895f3148b8229d8 (patch)
treefaddc60f0b27ed6d2a26f20c2c09f365dc4a2d7d /arch/ia64
parent07b8fede6da76ae6a0f547716c44b801a116bb4a (diff)
parent93918e9afc76717176e9e114e79cdbb602a45ae8 (diff)
Merge branch 'master'
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/lib/swiotlb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c
index dbc0b3e449c..a604efc7f6c 100644
--- a/arch/ia64/lib/swiotlb.c
+++ b/arch/ia64/lib/swiotlb.c
@@ -123,8 +123,8 @@ swiotlb_init_with_default_size (size_t default_size)
/*
* Get IO TLB memory from the low pages
*/
- io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs *
- (1 << IO_TLB_SHIFT));
+ io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *
+ (1 << IO_TLB_SHIFT), 0x100000000);
if (!io_tlb_start)
panic("Cannot allocate SWIOTLB buffer");
io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);