mm: change confusing #ifdef use in __access_remote_vm
Subsystems (2)
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 <[email protected]>
--- mm/memory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/memory.c +4 -2
@@ -3591,11 +3591,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 ;
@@ -3603,9 +3605,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 );