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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67697C433F5 for ; Fri, 25 Mar 2022 00:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351430AbiCYAhQ (ORCPT ); Thu, 24 Mar 2022 20:37:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354311AbiCYAhQ (ORCPT ); Thu, 24 Mar 2022 20:37:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62438BB0B4 for ; Thu, 24 Mar 2022 17:35:43 -0700 (PDT) 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 21C1AB826E8 for ; Fri, 25 Mar 2022 00:35:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE75C340EC; Fri, 25 Mar 2022 00:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1648168540; bh=1yawJDy+PBrkP4bscv+4AH83qT2S0sHM01TA9rgRyek=; h=Date:To:From:Subject:From; b=DhCRNgPYXo+LIvBlpB7SsBK9FfCaGiqrrfJOPxka2oHU+TtfAt1VIlWCI0K2IsAYx No/SluMus0I0jAmRQXf/nNbArPLdSW1+i9nd0PuGfSZYJYCBBxoC8e6uiV4opbLFlR 0lKPlQ9pqGk94yhsPzZ52g7YzIfCm7YwgRN9IE4I= Date: Thu, 24 Mar 2022 17:35:40 -0700 To: mm-commits@vger.kernel.org, zhangliang5@huawei.com, willy@infradead.org, vbabka@suse.cz, shy828301@gmail.com, shakeelb@google.com, rppt@linux.ibm.com, roman.gushchin@linux.dev, rientjes@google.com, riel@surriel.com, peterx@redhat.com, oleg@redhat.com, nadav.amit@gmail.com, mike.kravetz@oracle.com, mhocko@kernel.org, kirill.shutemov@linux.intel.com, jhubbard@nvidia.com, jgg@nvidia.com, jannh@google.com, jack@suse.cz, hughd@google.com, hch@lst.de, ddutile@redhat.com, david@redhat.com, aarcange@redhat.com, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix.patch removed from -mm tree Message-Id: <20220325003540.CCE75C340EC@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix has been removed from the -mm tree. Its filename was mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix.patch This patch was dropped because it was folded into mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch ------------------------------------------------------ From: Andrew Morton Subject: mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix simplificatoin, per Yang Shi Cc: Andrea Arcangeli Cc: Christoph Hellwig Cc: David Hildenbrand Cc: David Rientjes Cc: Don Dutile Cc: Hugh Dickins Cc: Jan Kara Cc: Jann Horn Cc: Jason Gunthorpe Cc: John Hubbard Cc: Kirill A. Shutemov Cc: Liang Zhang Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Mike Kravetz Cc: Mike Rapoport Cc: Nadav Amit Cc: Oleg Nesterov Cc: Peter Xu Cc: Rik van Riel Cc: Roman Gushchin Cc: Shakeel Butt Cc: Vlastimil Babka Cc: Yang Shi Signed-off-by: Andrew Morton --- mm/huge_memory.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/mm/huge_memory.c~mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix +++ a/mm/huge_memory.c @@ -2151,12 +2151,10 @@ void __split_huge_pmd(struct vm_area_str goto out; } - if (pmd_trans_huge(*pmd)) { - if (!folio) - folio = page_folio(pmd_page(*pmd)); - } else if (!(pmd_devmap(*pmd) || is_pmd_migration_entry(*pmd))) - goto out; - __split_huge_pmd_locked(vma, pmd, range.start, freeze); + if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || + is_pmd_migration_entry(*pmd)) + __split_huge_pmd_locked(vma, pmd, range.start, freeze); + out: spin_unlock(ptl); /* _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd.patch mm.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch mutex-subsystem-synchro-test-module-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch