VisionFive2 Linux kernel

author: Ingo Molnar <mingo@kernel.org> 2017-08-11 13:51:59 +0200 committer: Ingo Molnar <mingo@kernel.org> 2017-08-11 13:51:59 +0200 commit: 040cca3ab2f6f8b8d26e0e4965abea2b9aa14818 parent: ef0758dd0fd70b98b889af26e27f003656952db8

Commit Summary:

Merge branch 'linus' into locking/core, to resolve conflicts

Diffstat:

1 file changed, 2 insertions, 2 deletions

diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 44fcbefd84a2..886085b47c75 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -1597,7 +1597,7 @@ static int userfaultfd_copy(struct userfaultfd_ctx *ctx,
 				   uffdio_copy.len);
 		mmput(ctx->mm);
 	} else {
-		return -ENOSPC;
+		return -ESRCH;
 	}
 	if (unlikely(put_user(ret, &user_uffdio_copy->copy)))
 		return -EFAULT;
@@ -1644,7 +1644,7 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx,
 				     uffdio_zeropage.range.len);
 		mmput(ctx->mm);
 	} else {
-		return -ENOSPC;
+		return -ESRCH;
 	}
 	if (unlikely(put_user(ret, &user_uffdio_zeropage->zeropage)))
 		return -EFAULT;