Merge ee01c4d72a
("Merge branch 'akpm' (patches from Andrew)") into android-mainline
Steps along the way to 5.8-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6cca4fa48322228c8182201d68dc05f9b72cfc50
This commit is contained in:
@@ -928,10 +928,7 @@ static int lookup_node(struct mm_struct *mm, unsigned long addr)
|
||||
|
||||
int locked = 1;
|
||||
err = get_user_pages_locked(addr & PAGE_MASK, 1, 0, &p, &locked);
|
||||
if (err == 0) {
|
||||
/* E.g. GUP interrupted by fatal signal */
|
||||
err = -EFAULT;
|
||||
} else if (err > 0) {
|
||||
if (err > 0) {
|
||||
err = page_to_nid(p);
|
||||
put_page(p);
|
||||
}
|
||||
|
Reference in New Issue
Block a user