mm: change confusing #ifdef use in __access_remote_vm
This patch changes confusing #ifdef use in __access_remote_vm into merely ugly #ifdef use. Addresses bug https://bugzilla.kernel.org/show_bug.cgi?id=81651 Signed-off-by: Rik van Riel <riel@redhat.com> Reported-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
68b5a65248
Коммит
dbffcd03d7
|
@ -3613,11 +3613,13 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
|
|||
ret = get_user_pages(tsk, mm, addr, 1,
|
||||
write, 1, &page, &vma);
|
||||
if (ret <= 0) {
|
||||
#ifndef CONFIG_HAVE_IOREMAP_PROT
|
||||
break;
|
||||
#else
|
||||
/*
|
||||
* Check if this is a VM_IO | VM_PFNMAP VMA, which
|
||||
* we can access using slightly different code.
|
||||
*/
|
||||
#ifdef CONFIG_HAVE_IOREMAP_PROT
|
||||
vma = find_vma(mm, addr);
|
||||
if (!vma || vma->vm_start > addr)
|
||||
break;
|
||||
|
@ -3625,9 +3627,9 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
|
|||
ret = vma->vm_ops->access(vma, addr, buf,
|
||||
len, write);
|
||||
if (ret <= 0)
|
||||
#endif
|
||||
break;
|
||||
bytes = ret;
|
||||
#endif
|
||||
} else {
|
||||
bytes = len;
|
||||
offset = addr & (PAGE_SIZE-1);
|
||||
|
|
Загрузка…
Ссылка в новой задаче