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 branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
mm
/
rmap.c
diff --git
a/mm/rmap.c
b/mm/rmap.c
index
07fc947
..
0feeef8
100644
(file)
--- a/
mm/rmap.c
+++ b/
mm/rmap.c
@@
-336,14
+336,13
@@
vma_address(struct page *page, struct vm_area_struct *vma)
/*
* At what user virtual address is page expected in vma?
/*
* At what user virtual address is page expected in vma?
- *
checking that the page matches
the vma.
+ *
Caller should check the page is actually part of
the vma.
*/
unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
{
*/
unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma)
{
- if (PageAnon(page)) {
- if (vma->anon_vma != page_anon_vma(page))
- return -EFAULT;
- } else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
+ if (PageAnon(page))
+ ;
+ else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
if (!vma->vm_file ||
vma->vm_file->f_mapping != page->mapping)
return -EFAULT;
if (!vma->vm_file ||
vma->vm_file->f_mapping != page->mapping)
return -EFAULT;