git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master'
[pandora-kernel.git]
/
arch
/
ia64
/
mm
/
hugetlbpage.c
diff --git
a/arch/ia64/mm/hugetlbpage.c
b/arch/ia64/mm/hugetlbpage.c
index
d3ce8f3
..
c45fc7f
100644
(file)
--- a/
arch/ia64/mm/hugetlbpage.c
+++ b/
arch/ia64/mm/hugetlbpage.c
@@
-24,7
+24,7
@@
unsigned int hpage_shift=HPAGE_SHIFT_DEFAULT;
pte_t *
unsigned int hpage_shift=HPAGE_SHIFT_DEFAULT;
pte_t *
-huge_pte_alloc
(struct mm_struct *mm, unsigned long addr
)
+huge_pte_alloc
(struct mm_struct *mm, unsigned long addr, unsigned long sz
)
{
unsigned long taddr = htlbpage_to_page(addr);
pgd_t *pgd;
{
unsigned long taddr = htlbpage_to_page(addr);
pgd_t *pgd;
@@
-75,7
+75,8
@@
int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
* Don't actually need to do any preparation, but need to make sure
* the address is in the right region.
*/
* Don't actually need to do any preparation, but need to make sure
* the address is in the right region.
*/
-int prepare_hugepage_range(unsigned long addr, unsigned long len)
+int prepare_hugepage_range(struct file *file,
+ unsigned long addr, unsigned long len)
{
if (len & ~HPAGE_MASK)
return -EINVAL;
{
if (len & ~HPAGE_MASK)
return -EINVAL;
@@
-106,13
+107,19
@@
int pmd_huge(pmd_t pmd)
{
return 0;
}
{
return 0;
}
+
+int pud_huge(pud_t pud)
+{
+ return 0;
+}
+
struct page *
follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write)
{
return NULL;
}
struct page *
follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write)
{
return NULL;
}
-void hugetlb_free_pgd_range(struct mmu_gather *
*
tlb,
+void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor, unsigned long ceiling)
{
unsigned long addr, unsigned long end,
unsigned long floor, unsigned long ceiling)
{
@@
-149,7
+156,7
@@
unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
/* Handle MAP_FIXED */
if (flags & MAP_FIXED) {
/* Handle MAP_FIXED */
if (flags & MAP_FIXED) {
- if (prepare_hugepage_range(addr, len))
+ if (prepare_hugepage_range(
file,
addr, len))
return -EINVAL;
return addr;
}
return -EINVAL;
return addr;
}