Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54239
b: refs/heads/master
c: 4b1d892
h: refs/heads/master
i:
  54237: b8bede1
  54235: 3d2d61e
  54231: e7d46ae
  54223: e1334e0
  54207: 738a4eb
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed May 7, 2007
1 parent 212fe03 commit e3528d2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 06abdfb47ee745a4d79721de24260815ec6bca2b
refs/heads/master: 4b1d89290b62bb2db476c94c82cf7442aab440c8
16 changes: 0 additions & 16 deletions trunk/mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1382,22 +1382,6 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
if (addr & ~PAGE_MASK)
return -EINVAL;

if (file && is_file_hugepages(file)) {
/*
* Check if the given range is hugepage aligned, and
* can be made suitable for hugepages.
*/
ret = prepare_hugepage_range(addr, len, pgoff);
} else {
/*
* Ensure that a normal request is not falling in a
* reserved hugepage range. For some archs like IA-64,
* there is a separate region for hugepages.
*/
ret = is_hugepage_only_range(current->mm, addr, len);
}
if (ret)
return -EINVAL;
return addr;
}

Expand Down

0 comments on commit e3528d2

Please sign in to comment.