git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ia64
/
mm
/
hugetlbpage.c
diff --git
a/arch/ia64/mm/hugetlbpage.c
b/arch/ia64/mm/hugetlbpage.c
index
c724358
..
fbd24a0
100644
(file)
--- a/
arch/ia64/mm/hugetlbpage.c
+++ b/
arch/ia64/mm/hugetlbpage.c
@@
-160,8
+160,6
@@
struct page *follow_huge_addr(struct mm_struct *mm, unsigned long addr, int writ
struct page *page;
pte_t *ptep;
struct page *page;
pte_t *ptep;
- if (! mm->used_hugetlb)
- return ERR_PTR(-EINVAL);
if (REGION_NUMBER(addr) != REGION_HPAGE)
return ERR_PTR(-EINVAL);
if (REGION_NUMBER(addr) != REGION_HPAGE)
return ERR_PTR(-EINVAL);
@@
-300,7
+298,7
@@
int hugetlb_prefault(struct address_space *mapping, struct vm_area_struct *vma)
unlock_page(page);
} else {
hugetlb_put_quota(mapping);
unlock_page(page);
} else {
hugetlb_put_quota(mapping);
-
free_huge_pag
e(page);
+
page_cache_releas
e(page);
goto out;
}
}
goto out;
}
}