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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 4CDDCC43460 for ; Thu, 1 Apr 2021 00:20:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29A32610CD for ; Thu, 1 Apr 2021 00:20:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232585AbhDAATe (ORCPT ); Wed, 31 Mar 2021 20:19:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:60078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229486AbhDAATO (ORCPT ); Wed, 31 Mar 2021 20:19:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CDC4560FEE; Thu, 1 Apr 2021 00:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1617236354; bh=It3LnEcRLD2fHwLRdaYd9LGdVhKrv+gZgHghYLO5I1Q=; h=Date:From:To:Subject:From; b=yBie+C4weJ95SyAollzIaeFNf8oPz/RHxyKkOD9h2xXDBbxUA0IIQWRcYWrf2IFLl BImlIyomc3e1GIlDBmlhXxPcl4aOdq87tzLIcb3mi+e7/xUxZAyrYlLSBw0kgzUOXr DWe0Fbmmeygj7vBWsXherL/OMwEjN5EadUK46AqA= Date: Wed, 31 Mar 2021 17:19:13 -0700 From: akpm@linux-foundation.org To: jhubbard@nvidia.com, mhocko@suse.com, mm-commits@vger.kernel.org, pasha.tatashin@soleen.com, rppt@linux.ibm.com Subject: + mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch added to -mm tree Message-ID: <20210401001913.wTj54Q5pi%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/hugeltb: fix renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN has been added to the -mm tree. Its filename is mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mike Rapoport Subject: mm/hugeltb: fix renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN The renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN missed one occurrence in mm/hugetlb.c which causes build error: CC mm/hugetlb.o mm/hugetlb.c: In function `dequeue_huge_page_node_exact': mm/hugetlb.c:1081:33: error: `PF_MEMALLOC_NOCMA' undeclared (first use in this function); did you mean `PF_MEMALLOC_NOFS'? bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); ^~~~~~~~~~~~~~~~~ PF_MEMALLOC_NOFS mm/hugetlb.c:1081:33: note: each undeclared identifier is reported only once for each function it appears in scripts/Makefile.build:273: recipe for target 'mm/hugetlb.o' failed make[2]: *** [mm/hugetlb.o] Error 1 Link: https://lkml.kernel.org/r/20210331163816.11517-1-rppt@kernel.org Signed-off-by: Mike Rapoport Cc: Pavel Tatashin Cc: John Hubbard Cc: Michal Hocko Signed-off-by: Andrew Morton --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/hugetlb.c~mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix +++ a/mm/hugetlb.c @@ -1078,7 +1078,7 @@ static void enqueue_huge_page(struct hst static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) { struct page *page; - bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); + bool pin = !!(current->flags & PF_MEMALLOC_PIN); lockdep_assert_held(&hugetlb_lock); list_for_each_entry(page, &h->hugepage_freelists[nid], lru) { _ Patches currently in -mm which might be from rppt@linux.ibm.com are nds32-flush_dcache_page-use-page_mapping_file-to-avoid-races-with-swapoff.patch mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch mmap-make-mlock_future_check-global.patch riscv-kconfig-make-direct-map-manipulation-options-depend-on-mmu.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-where-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch