diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-24 09:19:36 +0100 |
| commit | 47c564e10f219f867bdb49225972749a43485a47 (patch) | |
| tree | 5e119e0f2e011f422d880d88d1adb2142e508bfc /arch/ia64/lib/swiotlb.c | |
| parent | c9c2009a4e915db17f32701d1f0535b400e61b58 (diff) | |
| parent | ba9e358fd04190a59e605c2963a15e014139a707 (diff) | |
| download | kernel-crypto-47c564e10f219f867bdb49225972749a43485a47.tar.gz kernel-crypto-47c564e10f219f867bdb49225972749a43485a47.tar.xz kernel-crypto-47c564e10f219f867bdb49225972749a43485a47.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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 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); |