mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
commit
1236d6bb6e
967 changed files with 12885 additions and 6418 deletions
|
|
@ -219,8 +219,17 @@ int cxllib_handle_fault(struct mm_struct *mm, u64 addr, u64 size, u64 flags)
|
|||
|
||||
down_read(&mm->mmap_sem);
|
||||
|
||||
for (dar = addr; dar < addr + size; dar += page_size) {
|
||||
if (!vma || dar < vma->vm_start || dar > vma->vm_end) {
|
||||
vma = find_vma(mm, addr);
|
||||
if (!vma) {
|
||||
pr_err("Can't find vma for addr %016llx\n", addr);
|
||||
rc = -EFAULT;
|
||||
goto out;
|
||||
}
|
||||
/* get the size of the pages allocated */
|
||||
page_size = vma_kernel_pagesize(vma);
|
||||
|
||||
for (dar = (addr & ~(page_size - 1)); dar < (addr + size); dar += page_size) {
|
||||
if (dar < vma->vm_start || dar >= vma->vm_end) {
|
||||
vma = find_vma(mm, addr);
|
||||
if (!vma) {
|
||||
pr_err("Can't find vma for addr %016llx\n", addr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue