lkml.org 
[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm-current tree with the mips tree
Hi Andrew,

On Fri, 29 May 2020 14:15:46 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Thu, 28 May 2020 19:29:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > --- a/mm/memory.c
> > +++ b/mm/memory.c
> > @@@ -2752,9 -2748,6 +2749,8 @@@ static vm_fault_t wp_page_copy(struct v
> > /* Free the old page.. */
> > new_page = old_page;
> > page_copied = 1;
> > + } else {
> > + update_mmu_tlb(vma, vmf->address, vmf->pte);
> > - mem_cgroup_cancel_charge(new_page, memcg, false);
> > }
> >
> > if (new_page)
>
> We decided that the update_mmu_tlb() call is no longer needed here, so
> there is no need to re-add it when resolving this.

OK, I have fixed up my merge resolution to remove those 2 lines.
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-05-30 00:57    [W:0.051 / U:0.448 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site