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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21BC8C433ED for ; Thu, 13 May 2021 21:08:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 67A7C6143E for ; Thu, 13 May 2021 21:08:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67A7C6143E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B42256B0036; Thu, 13 May 2021 17:08:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF2096B006E; Thu, 13 May 2021 17:08:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96C5E6B0070; Thu, 13 May 2021 17:08:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0030.hostedemail.com [216.40.44.30]) by kanga.kvack.org (Postfix) with ESMTP id 644216B0036 for ; Thu, 13 May 2021 17:08:37 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E991A180260F2 for ; Thu, 13 May 2021 21:08:36 +0000 (UTC) X-FDA: 78137446632.02.B6C1A7B Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf28.hostedemail.com (Postfix) with ESMTP id CAA522000253 for ; Thu, 13 May 2021 21:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=puMCBatXvbMaxJ2hgetoloHiCLuOQHxAQ0mJZIFbNO4=; b=lnkdnmEFdc96TvOfe+wgZjwi8T wHYrRqnF/Q3VjUvdkqzVp4p+/N+PoSHFJsxDq654rkmB8gf6/3iqBGRwec+9BwDP2W7skuy/qlKR6 xeFwqYaXXfVmdPn8kW1kFGbNaDHXzGTlhV8bwiU7B70Acd6t0SNtHFX4m2GYw0kJ+Q5fUn14XeZCJ HMXi9g6UfjrwABORcO+yyWP9wEwtB0ThbvKINLKZjLMgEXopt7o7p0kCbegGfysNVBoCOizzWYhIS qtzA7gM4QlCPoQ8K/eqvBLEeCE+veP90WBsul6d/+UGj25k9wZFiO1LexQV2r5rqDuaZZ7R7VuaZD 8repElig==; Received: from [2601:1c0:6280:3f0::7376] by bombadil.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lhIZJ-00BX4A-TH; Thu, 13 May 2021 21:08:29 +0000 Subject: Re: mmotm 2021-05-12-21-46 uploaded (arch/x86/mm/pgtable.c) To: Andrew Morton , Christophe Leroy Cc: broonie@kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-next@vger.kernel.org, mhocko@suse.cz, mm-commits@vger.kernel.org, sfr@canb.auug.org.au References: <20210513044710.MCXhM_NwC%akpm@linux-foundation.org> <151ddd7f-1d3e-a6f7-daab-e32f785426e1@infradead.org> <54055e72-34b8-d43d-2ad3-87e8c8fa547b@csgroup.eu> <20210513134754.ab3f1a864b0156ef99248401@linux-foundation.org> From: Randy Dunlap Message-ID: Date: Thu, 13 May 2021 14:08:29 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210513134754.ab3f1a864b0156ef99248401@linux-foundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Rspamd-Queue-Id: CAA522000253 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=lnkdnmEF; spf=none (imf28.hostedemail.com: domain of rdunlap@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=rdunlap@infradead.org; dmarc=none X-Rspamd-Server: rspam04 X-Stat-Signature: 6udiaod1m588jxdn556mz4auqpm6d8d3 X-HE-Tag: 1620940115-481752 Content-Transfer-Encoding: quoted-printable 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: On 5/13/21 1:47 PM, Andrew Morton wrote: > On Thu, 13 May 2021 19:09:23 +0200 Christophe Leroy wrote: >=20 >> >> >>> on i386: >>> >>> ../arch/x86/mm/pgtable.c:703:5: error: redefinition of =E2=80=98pud_s= et_huge=E2=80=99 >>> int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) >>> ^~~~~~~~~~~~ >>> In file included from ../include/linux/mm.h:33:0, >>> from ../arch/x86/mm/pgtable.c:2: >>> ../include/linux/pgtable.h:1387:19: note: previous definition of =E2=80= =98pud_set_huge=E2=80=99 was here >>> static inline int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot= _t prot) >>> ^~~~~~~~~~~~ >>> ../arch/x86/mm/pgtable.c:758:5: error: redefinition of =E2=80=98pud_c= lear_huge=E2=80=99 >>> int pud_clear_huge(pud_t *pud) >>> ^~~~~~~~~~~~~~ >>> In file included from ../include/linux/mm.h:33:0, >>> from ../arch/x86/mm/pgtable.c:2: >>> ../include/linux/pgtable.h:1391:19: note: previous definition of =E2=80= =98pud_clear_huge=E2=80=99 was here >>> static inline int pud_clear_huge(pud_t *pud) >>> ^~~~~~~~~~~~~~ >> >> Hum ... >> >> Comes from my patch=20 >> https://patchwork.ozlabs.org/project/linuxppc-dev/patch/5ac5976419350e= 8e048d463a64cae449eb3ba4b0.1620795204.git.christophe.leroy@csgroup.eu/ >> >> But, that happens only if x86 defines __PAGETABLE_PUD_FOLDED. And if P= UD is folded, then I can't=20 >> understand my it has pud_set_huge() and pud_clear_huge() functions. >=20 > Probably because someone messed something up ;) >=20 > Let's try this. >=20 > --- a/arch/x86/mm/pgtable.c~mm-pgtable-add-stubs-for-pmd-pub_set-clear_= huge-fix > +++ a/arch/x86/mm/pgtable.c That also works_for_me. Acked-by: Randy Dunlap # build-tested thanks. --=20 ~Randy