diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /kernel/fork.c | |
parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) |
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, | |||
550 | goto out; | 550 | goto out; |
551 | } | 551 | } |
552 | /* a new mm has just been created */ | 552 | /* a new mm has just been created */ |
553 | arch_dup_mmap(oldmm, mm); | 553 | retval = arch_dup_mmap(oldmm, mm); |
554 | retval = 0; | ||
555 | out: | 554 | out: |
556 | up_write(&mm->mmap_sem); | 555 | up_write(&mm->mmap_sem); |
557 | flush_tlb_mm(oldmm); | 556 | flush_tlb_mm(oldmm); |