lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture

Browse Source 
Update the ia64 hugetlb_get_unmapped_area function to make use of
vm_unmapped_area() instead of implementing a brute force search.

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Michel Lespinasse
2013-02-21 15:10:29 -08:00
committed by Tony Luck
parent f53f232504
commit e31048af84
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/ia64/mm/hugetlbpage.c
View File

@@ -148,7 +148,7 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
unsigned long pgoff, unsigned long flags) unsigned long pgoff, unsigned long flags)
{ {
struct vm_area_struct *vmm; struct vm_unmapped_area_info info;
if (len > RGN_MAP_LIMIT) if (len > RGN_MAP_LIMIT)
return -ENOMEM; return -ENOMEM;
@@ -165,16 +165,14 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
/* This code assumes that RGN_HPAGE != 0. */ /* This code assumes that RGN_HPAGE != 0. */
if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1))) if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1)))
addr = HPAGE_REGION_BASE; addr = HPAGE_REGION_BASE;
else
addr = ALIGN(addr, HPAGE_SIZE); info.flags = 0;
for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) { info.length = len;
/* At this point: (!vmm || addr < vmm->vm_end). */ info.low_limit = addr;
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
return -ENOMEM; info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
if (!vmm || (addr + len) <= vmm->vm_start) info.align_offset = 0;
return addr; return vm_unmapped_area(&info);
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
} }
static int __init hugetlb_setup_sz(char *str) static int __init hugetlb_setup_sz(char *str)