diff options
author | 2018-09-27 11:06:46 +1000 | |
---|---|---|
committer | 2018-09-27 11:06:46 +1000 | |
commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /kernel/fork.c | |
parent | Merge tag 'drm-hisilicon-next-2018-09-26' of github.com:xin3liang/linux into drm-next (diff) | |
parent | Linux 4.19-rc5 (diff) | |
download | wireguard-linux-bf78296ab1cb215d0609ac6cff4e43e941e51265.tar.xz wireguard-linux-bf78296ab1cb215d0609ac6cff4e43e941e51265.zip |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index d896e9ca38b0..f0b58479534f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -550,8 +550,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, goto out; } /* a new mm has just been created */ - arch_dup_mmap(oldmm, mm); - retval = 0; + retval = arch_dup_mmap(oldmm, mm); out: up_write(&mm->mmap_sem); flush_tlb_mm(oldmm); |