diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-11 14:51:59 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-11 14:51:59 +0300 |
| commit | 040cca3ab2f6f8b8d26e0e4965abea2b9aa14818 (patch) | |
| tree | 25709ba52ee06fccf4bfbfbf2897bb8cf86da828 /fs/userfaultfd.c | |
| parent | ef0758dd0fd70b98b889af26e27f003656952db8 (diff) | |
| parent | b2dbdf2ca1d2803e9cdc46a94554c4a39ffb235a (diff) | |
| download | linux-040cca3ab2f6f8b8d26e0e4965abea2b9aa14818.tar.xz | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/mm_types.h
mm/huge_memory.c
I removed the smp_mb__before_spinlock() like the following commit does:
8b1b436dd1cc ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")
and fixed up the affected commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/userfaultfd.c')
| -rw-r--r-- | fs/userfaultfd.c | 4 |
1 files 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; |