diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /lib/swiotlb.c | |
| parent | [PATCH] Removed remaining PCI specific references from swiotlb.c (diff) | |
| parent | [PATCH] Fix handling spurious page fault for hugetlb region (diff) | |
| download | linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.xz linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'lib/swiotlb.c')
| -rw-r--r-- | lib/swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index c2fc470b6ed8..5bdeaaea57fd 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -142,8 +142,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); |