Re: [PATCH v7 11/70] arch/arm64: Remove the merge workaround for VMA_ITERATOR

Liam Howlett
2022-04-05T21:24:24Z

* Will Deacon <will@kernel.org> [220405 05:25]:
> Hi Liam,
>
> On Mon, Apr 04, 2022 at 02:35:36PM +0000, Liam Howlett wrote:
> > Now that the vma iterator is in the kernel, remove the workaround.
> >
> > Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> > ---
> > arch/arm64/kernel/elfcore.c | 7 -------
> > 1 file changed, 7 deletions(-)
> >
> > diff --git a/arch/arm64/kernel/elfcore.c b/arch/arm64/kernel/elfcore.c
> > index 3ed39c61a510..930a0bc4cac4 100644
> > --- a/arch/arm64/kernel/elfcore.c
> > +++ b/arch/arm64/kernel/elfcore.c
> > @@ -8,13 +8,6 @@
> > #include <asm/cpufeature.h>
> > #include <asm/mte.h>
> >
> > -#ifndef VMA_ITERATOR
> > -#define VMA_ITERATOR(name, mm, addr) \
> > - struct mm_struct *name = mm
> > -#define for_each_vma(vmi, vma) \
> > - for (vma = vmi->mmap; vma; vma = vma->vm_next)
> > -#endif
>
> I already have this revert queued up as an arm64 fix:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/commit/?h=for-next/fixes&id=a0ab7e5bc9651d65637f50ee9c09e083919677ed
>
> Should land for -rc2.

Thanks Will.

Note that I'm asking Andrew to include the set into mmotm and not
directly into linux-next this time as requested by Andrew.

Thanks,
Liam