git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: compaction: direct compact when a high-order allocation fails
[safe/jmp/linux-2.6]
/
mm
/
nommu.c
diff --git
a/mm/nommu.c
b/mm/nommu.c
index
e4b8f4d
..
63fa17d
100644
(file)
--- a/
mm/nommu.c
+++ b/
mm/nommu.c
@@
-146,7
+146,7
@@
int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
for (i = 0; i < nr_pages; i++) {
(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
for (i = 0; i < nr_pages; i++) {
- vma = find_
extend_
vma(mm, start);
+ vma = find_vma(mm, start);
if (!vma)
goto finish_or_fault;
if (!vma)
goto finish_or_fault;
@@
-162,7
+162,7
@@
int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
}
if (vmas)
vmas[i] = vma;
}
if (vmas)
vmas[i] = vma;
- start
+= PAGE_SIZE
;
+ start
= (start + PAGE_SIZE) & PAGE_MASK
;
}
return i;
}
return i;
@@
-764,7
+764,7
@@
EXPORT_SYMBOL(find_vma);
*/
struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
{
*/
struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
{
- return find_vma(mm, addr
& PAGE_MASK
);
+ return find_vma(mm, addr);
}
/*
}
/*