projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[cascardo/linux.git]
/
fs
/
proc
/
task_mmu.c
diff --git
a/fs/proc/task_mmu.c
b/fs/proc/task_mmu.c
index
da6b01d
..
c126c83
100644
(file)
--- a/
fs/proc/task_mmu.c
+++ b/
fs/proc/task_mmu.c
@@
-706,6
+706,7
@@
static int pagemap_hugetlb_range(pte_t *pte, unsigned long hmask,
* skip over unmapped regions.
*/
#define PAGEMAP_WALK_SIZE (PMD_SIZE)
* skip over unmapped regions.
*/
#define PAGEMAP_WALK_SIZE (PMD_SIZE)
+#define PAGEMAP_WALK_MASK (PMD_MASK)
static ssize_t pagemap_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
static ssize_t pagemap_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
@@
-776,7
+777,7
@@
static ssize_t pagemap_read(struct file *file, char __user *buf,
unsigned long end;
pm.pos = 0;
unsigned long end;
pm.pos = 0;
- end =
start_vaddr + PAGEMAP_WALK_SIZE
;
+ end =
(start_vaddr + PAGEMAP_WALK_SIZE) & PAGEMAP_WALK_MASK
;
/* overflow ? */
if (end < start_vaddr || end > end_vaddr)
end = end_vaddr;
/* overflow ? */
if (end < start_vaddr || end > end_vaddr)
end = end_vaddr;