From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6876AC433EF for ; Tue, 5 Apr 2022 09:25:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F8F26B0071; Tue, 5 Apr 2022 05:25:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AA0C6B0073; Tue, 5 Apr 2022 05:25:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 770FE6B0074; Tue, 5 Apr 2022 05:25:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 6A0966B0071 for ; Tue, 5 Apr 2022 05:25:16 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 2649160567 for ; Tue, 5 Apr 2022 09:25:06 +0000 (UTC) X-FDA: 79322291412.14.70B6D55 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf16.hostedemail.com (Postfix) with ESMTP id A2BAF180004 for ; Tue, 5 Apr 2022 09:25:05 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D16E7B81C69; Tue, 5 Apr 2022 09:25:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CDBAC385A4; Tue, 5 Apr 2022 09:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649150702; bh=kogP6nO7wU0ilpGa8JtIr5fN9KE3TnBqzaKz14TEHYA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ijeYoLORnSLf/AoiqG4azMEprQrMRfuFMpyxCeV8qw1UTVmW8dOxNKVseYbED+vAe 231KKUQL50gbav6+5GJbGHqonejP5dzlB6OZkwJV2KTcH9z9OQUX8HkylsCFhrb6pP nn4c81PFSrWCxQpyGOu4i3SolWFCSmu3aL9SF7rVQInCux5C3pvUgmyS4upGC3vc60 EEWxKVFp3wo+T3WYgIHw+Mrpoz8EF209VEKQaowwNeLawEXOJ/wDHI52uUkASeHP4N vPrXct/qNzUUqv5GpDnlZIdqn7o8IGOr6y5NcRR5CPn/5fBMFZwDp2DQt35NPLaMeb AEL2hHqkxmE+g== Date: Tue, 5 Apr 2022 10:24:57 +0100 From: Will Deacon To: Liam Howlett Cc: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: Re: [PATCH v7 11/70] arch/arm64: Remove the merge workaround for VMA_ITERATOR Message-ID: <20220405092456.GA24387@willie-the-truck> References: <20220404143501.2016403-1-Liam.Howlett@oracle.com> <20220404143501.2016403-12-Liam.Howlett@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220404143501.2016403-12-Liam.Howlett@oracle.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Stat-Signature: kxqraxxbds315frwam8feg1enijaobtk Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ijeYoLOR; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of will@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=will@kernel.org X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: A2BAF180004 X-HE-Tag: 1649150705-766967 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 > --- > 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 > #include > > -#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. Will