From patchwork Wed Sep 27 23:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 145755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3098918vqu; Wed, 27 Sep 2023 23:02:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGM+igG5D/3AfagdiIMhwNEmpTBi1ME2clYX8ixKQR6BHbN+4TfD/wpM6cO74kr5VZlnPam X-Received: by 2002:a05:6a00:3905:b0:68e:4955:c405 with SMTP id fh5-20020a056a00390500b0068e4955c405mr249784pfb.27.1695880976591; Wed, 27 Sep 2023 23:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695880976; cv=none; d=google.com; s=arc-20160816; b=sgwFIbbzGxrnDdahRykEcSbdNCxR62ufYboARe16nxwE5rRi4zfTaHh1MIr0/AmrEe PDje8WcjQiIwOQx9RVXsyU041yHzSh1j3a7dfyArezHDoWa4mGjVFBk0dYzfokutJ3nj OBskCeXzDOTctJ+uiZxxh4QAmgaGZboHEtseYdGJuftmx8+4PQPatd9Sd40i/i9TCoWU ql616RInQpA7uGc5zE+SlpjBKvy2mmZyt4FutKgc+a7TwJG6XJss86YGK1No+sdEkhEn S4l5lh0LGCKtU1GZAohf9ZKsoFjZDWnjOtvEAdolLAJNP10fil9VxIirjo3AVIvQ8qMN HsKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=zhfsFs/91UsszYRV8XiJIBCUPhlph09fGzAxjulnJ6k=; fh=z4RFTHJ1+qO2gM5DC36h80wu4Q2JPgGo8FBvXTZenpw=; b=dSXNGJ/KCv5y/RWaV2ubQ7GejMzWNS1zKPJBiKG8kxYV6QlX3lb9rNHODEE2hjCQWl HIi/tDxomgMSoEoN3mXWL4X6s4zNYACfDQId+C3brc/tzaQ7RoduAm+iDXsxejFIc4cr f5vTxx0ezu4KXPs0EiEu8BDM4SFwUZBp7K+zli37Glj6ZDzR8044XrKNTERag08lj5lG inK/PwVXjZDoKULGtSuY56rNBBgam/BHJFnAmBYxN3LcevTyy+dIjvCECCUmKlUN0lva rN/Qqhay45zpLUbqX8nRTjKu7LZMRL1wy0k/WY+/Js/ZUcOi/IK2v9XEDeZyHQjO/wLj Ggfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=V9vEoTj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id g127-20020a636b85000000b00573f9a427d6si16733337pgc.450.2023.09.27.23.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 23:02:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=V9vEoTj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 500EF8030A88; Wed, 27 Sep 2023 16:23:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229957AbjI0XWp (ORCPT + 20 others); Wed, 27 Sep 2023 19:22:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbjI0XWn (ORCPT ); Wed, 27 Sep 2023 19:22:43 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 882C0F4; Wed, 27 Sep 2023 16:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695856956; bh=zhfsFs/91UsszYRV8XiJIBCUPhlph09fGzAxjulnJ6k=; h=Date:From:To:Cc:Subject:From; b=V9vEoTj9uA4NaNN66VXUAWsrZfxuE4MRR4qck0EFI+m8H9YEsJxlOC5sWUQVhkJwx rTfCUZjo9JaeJvL8fBQWfpFL1o0jjsMQXQdkICmWL/vVES2BqlVxFS2qr83WKxdDtk /WxfpVlYZalxRGFSRzJgSQQ+iHzh4atAV2rA4AdQjdDMHgRuxROL0PQV1zwQv6SKIB uo2mZpeXLIE+TLD+2rLqVGpNqx2DMvwschaLkl1XDDQwZJLdJJ86P8FCWLeeLYpA94 WjFRxVSkVLqf9dqfKh4PGvfql4YsyNyC3oay0sS1j4hwSceVpvFKY1qydAaJOTflBq BZvPqlVisW47A== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rwt1l1xXZz4xG0; Thu, 28 Sep 2023 09:22:35 +1000 (AEST) Date: Thu, 28 Sep 2023 09:22:23 +1000 From: Stephen Rothwell To: Andrew Morton Cc: Arnd Bergmann , Muhammad Usama Anjum , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the mm tree Message-ID: <20230928092223.0625c6bf@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 27 Sep 2023 16:23:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778260090724296410 X-GMAIL-MSGID: 1778260090724296410 Hi all, After merging the mm tree, today's linux-next build (arm multi_v7_defconfig) failed like this: fs/proc/task_mmu.c: In function 'pagemap_scan_pmd_entry': fs/proc/task_mmu.c:2153:22: error: implicit declaration of function 'pagemap_scan_is_interesting_page'; did you mean 'pagemap_scan_is_interesting_vma'? [-Werror=implicit-function-declaration] 2153 | if (!pagemap_scan_is_interesting_page(categories, p)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | pagemap_scan_is_interesting_vma Caused by commit 825ebc8e4bf9 ("fs/proc/task_mmu: hide unused pagemap_scan_backout_range() function") I applied the following fix patch. From: Stephen Rothwell Date: Thu, 28 Sep 2023 09:09:26 +1000 Subject: [PATCH] fix for "fs/proc/task_mmu: hide unused pagemap_scan_backout_range() function" Signed-off-by: Stephen Rothwell --- fs/proc/task_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index fdad3536d8ab..d4ef9a2bf95d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1940,6 +1940,7 @@ static void make_uffd_wp_huge_pte(struct vm_area_struct *vma, set_huge_pte_at(vma->vm_mm, addr, ptep, make_pte_marker(PTE_MARKER_UFFD_WP), psize); } +#endif /* CONFIG_HUGETLB_PAGE */ #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLB_PAGE) static void pagemap_scan_backout_range(struct pagemap_scan_private *p, @@ -1954,7 +1955,7 @@ static void pagemap_scan_backout_range(struct pagemap_scan_private *p, p->found_pages -= (end - addr) / PAGE_SIZE; } -#endif /* CONFIG_HUGETLB_PAGE */ +#endif static bool pagemap_scan_is_interesting_page(unsigned long categories, const struct pagemap_scan_private *p) @@ -1967,7 +1968,6 @@ static bool pagemap_scan_is_interesting_page(unsigned long categories, return true; } -#endif static bool pagemap_scan_is_interesting_vma(unsigned long categories, const struct pagemap_scan_private *p)