projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MIPS: Octeon: Implement delays with cycle counter.
[linux-2.6-block.git]
/
fs
/
proc
/
task_mmu.c
diff --git
a/fs/proc/task_mmu.c
b/fs/proc/task_mmu.c
index 47f5b145f56eee5aaefc3b52aac8fa78b978b692..aea1d3f1ffb5e761471f90a2f80096ac16031c62 100644
(file)
--- a/
fs/proc/task_mmu.c
+++ b/
fs/proc/task_mmu.c
@@
-634,6
+634,7
@@
static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
return err;
}
return err;
}
+#ifdef CONFIG_HUGETLB_PAGE
static u64 huge_pte_to_pagemap_entry(pte_t pte, int offset)
{
u64 pme = 0;
static u64 huge_pte_to_pagemap_entry(pte_t pte, int offset)
{
u64 pme = 0;
@@
-664,6
+665,7
@@
static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask,
return err;
}
return err;
}
+#endif /* HUGETLB_PAGE */
/*
* /proc/pid/pagemap - an array mapping virtual pages to pfns
/*
* /proc/pid/pagemap - an array mapping virtual pages to pfns
@@
-733,7
+735,9
@@
static ssize_t pagemap_read(struct file *file, char __user *buf,
pagemap_walk.pmd_entry = pagemap_pte_range;
pagemap_walk.pte_hole = pagemap_pte_hole;
pagemap_walk.pmd_entry = pagemap_pte_range;
pagemap_walk.pte_hole = pagemap_pte_hole;
+#ifdef CONFIG_HUGETLB_PAGE
pagemap_walk.hugetlb_entry = pagemap_hugetlb_range;
pagemap_walk.hugetlb_entry = pagemap_hugetlb_range;
+#endif
pagemap_walk.mm = mm;
pagemap_walk.private = ±
pagemap_walk.mm = mm;
pagemap_walk.private = ±