diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:11:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:11:25 -0400 |
| commit | 323cb3ce6eea9d4e72a81a9ffaac4c4e5b800810 (patch) | |
| tree | 01c9fc4f3d6757705d0c286da2aa153704c2a3bc /arch/ia64/lib/swiotlb.c | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ia64/lib/swiotlb.c')
| -rw-r--r-- | arch/ia64/lib/swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index dbc0b3e449c5..a604efc7f6c9 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) | |||
| 123 | /* | 123 | /* |
| 124 | * Get IO TLB memory from the low pages | 124 | * Get IO TLB memory from the low pages |
| 125 | */ | 125 | */ |
| 126 | io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs * | 126 | io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs * |
| 127 | (1 << IO_TLB_SHIFT)); | 127 | (1 << IO_TLB_SHIFT), 0x100000000); |
| 128 | if (!io_tlb_start) | 128 | if (!io_tlb_start) |
| 129 | panic("Cannot allocate SWIOTLB buffer"); | 129 | panic("Cannot allocate SWIOTLB buffer"); |
| 130 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); | 130 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); |