Commit fe29f768 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6

into kernel.bkbits.net:/home/davem/net-2.6
parents 49763ec3 59ddc721
...@@ -1421,16 +1421,10 @@ static int filemap_populate(struct vm_area_struct *vma, ...@@ -1421,16 +1421,10 @@ static int filemap_populate(struct vm_area_struct *vma,
return err; return err;
} }
} else { } else {
/*
* If a nonlinear mapping then store the file page offset
* in the pte.
*/
if (pgoff != linear_page_index(vma, addr)) {
err = install_file_pte(mm, vma, addr, pgoff, prot); err = install_file_pte(mm, vma, addr, pgoff, prot);
if (err) if (err)
return err; return err;
} }
}
len -= PAGE_SIZE; len -= PAGE_SIZE;
addr += PAGE_SIZE; addr += PAGE_SIZE;
......
...@@ -1121,16 +1121,10 @@ static int shmem_populate(struct vm_area_struct *vma, ...@@ -1121,16 +1121,10 @@ static int shmem_populate(struct vm_area_struct *vma,
return err; return err;
} }
} else if (nonblock) { } else if (nonblock) {
/*
* If a nonlinear mapping then store the file page
* offset in the pte.
*/
if (pgoff != linear_page_index(vma, addr)) {
err = install_file_pte(mm, vma, addr, pgoff, prot); err = install_file_pte(mm, vma, addr, pgoff, prot);
if (err) if (err)
return err; return err;
} }
}
len -= PAGE_SIZE; len -= PAGE_SIZE;
addr += PAGE_SIZE; addr += PAGE_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment