p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Rik van Riel 2014-08-06 16:08:12 -07:00 committed by Linus Torvalds
parent 68b5a65248
commit dbffcd03d7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mm/memory.c
View File

@ -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, ret = get_user_pages(tsk, mm, addr, 1,
write, 1, &page, &vma); write, 1, &page, &vma);
if (ret <= 0) { if (ret <= 0) {
#ifndef CONFIG_HAVE_IOREMAP_PROT
break;
#else
/* /*
* Check if this is a VM_IO | VM_PFNMAP VMA, which * Check if this is a VM_IO | VM_PFNMAP VMA, which
* we can access using slightly different code. * we can access using slightly different code.
*/ */
#ifdef CONFIG_HAVE_IOREMAP_PROT
vma = find_vma(mm, addr); vma = find_vma(mm, addr);
if (!vma || vma->vm_start > addr) if (!vma || vma->vm_start > addr)
break; 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, ret = vma->vm_ops->access(vma, addr, buf,
len, write); len, write);
if (ret <= 0) if (ret <= 0)
#endif
break; break;
bytes = ret; bytes = ret;
#endif
} else { } else {
bytes = len; bytes = len;
offset = addr & (PAGE_SIZE-1); offset = addr & (PAGE_SIZE-1);