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 B1877C433DB for ; Tue, 9 Feb 2021 20:12:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A9F064ECD for ; Tue, 9 Feb 2021 20:12:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233780AbhBIULL (ORCPT ); Tue, 9 Feb 2021 15:11:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:56266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233621AbhBITqA (ORCPT ); Tue, 9 Feb 2021 14:46:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE1CC64EDD; Tue, 9 Feb 2021 19:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1612899915; bh=4/bPcUe5zyH9YUoIpsI7U3297Jdn+0cFJEytQi7//rg=; h=Date:From:To:Subject:From; b=nQo5+FmA8cT+0gQghetDmkLxTjivc8m87VJJb9T342roh0hOgUdv27cIPdSsu6RsG Q6Kt1EdmKx3mEJX0mzxqfD5WyU547jOjn8nQcxJx6aup526HvpZE62oJ7Qnsgx0DC9 CU2+ZNPnLm4ZgqDmZyJfcrotJOn9CUjl9Tufamik= Date: Tue, 09 Feb 2021 11:45:14 -0800 From: akpm@linux-foundation.org To: linmiaohe@huawei.com, mike.kravetz@oracle.com, mm-commits@vger.kernel.org Subject: [alternative-merged] mm-hugetlb-remove-redundant-vm_bug_on_page-on-putback_active_hugepage.patch removed from -mm tree Message-ID: <20210209194514.r0GDpg8Sf%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/hugetlb: remove redundant VM_BUG_ON_PAGE on putback_active_hugepage() has been removed from the -mm tree. Its filename was mm-hugetlb-remove-redundant-vm_bug_on_page-on-putback_active_hugepage.patch This patch was dropped because an alternative patch was merged ------------------------------------------------------ From: Miaohe Lin Subject: mm/hugetlb: remove redundant VM_BUG_ON_PAGE on putback_active_hugepage() PageHead(page) is implicitly checked in set_page_huge_active() via the PageHeadHuge(page) check. So remove this explicit one. Link: https://lkml.kernel.org/r/20210208083739.33178-1-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Cc: Mike Kravetz Signed-off-by: Andrew Morton --- mm/hugetlb.c | 1 - 1 file changed, 1 deletion(-) --- a/mm/hugetlb.c~mm-hugetlb-remove-redundant-vm_bug_on_page-on-putback_active_hugepage +++ a/mm/hugetlb.c @@ -5636,7 +5636,6 @@ unlock: void putback_active_hugepage(struct page *page) { - VM_BUG_ON_PAGE(!PageHead(page), page); spin_lock(&hugetlb_lock); set_page_huge_active(page); list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist); _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-page_owner-use-helper-function-zone_end_pfn-to-get-end_pfn.patch mm-fix-potential-pte_unmap_unlock-pte-error.patch mm-simplify-the-vm_bug_on-condition-in-pmdp_huge_clear_flush.patch mm-pgtable-genericc-optimize-the-vm_bug_on-condition-in-pmdp_huge_clear_flush.patch mm-memoryc-fix-potential-pte_unmap_unlock-pte-error.patch mm-hugetlb-fix-potential-double-free-in-hugetlb_register_node-error-path.patch mm-hugetlb-avoid-unnecessary-hugetlb_acct_memory-call.patch mm-hugetlb-use-helper-huge_page_order-and-pages_per_huge_page.patch mm-hugetlb-fix-use-after-free-when-subpool-max_hpages-accounting-is-not-enabled.patch mm-hugetlb-fix-some-comment-typos.patch mm-remove-unused-return-value-of-set_huge_zero_page.patch hugetlb_cgroup-use-helper-pages_per_huge_page-in-hugetlb_cgroup.patch mm-hugetlb-use-helper-function-range_in_vma-in-page_table_shareable.patch mm-hugetlb-remove-unnecessary-vm_bug_on_page-on-putback_active_hugepage.patch mm-hugetlb-use-helper-huge_page_size-to-get-hugepage-size.patch mm-workingsetc-avoid-unnecessary-max_nodes-estimation-in-count_shadow_nodes.patch z3fold-remove-unused-attribute-for-release_z3fold_page.patch z3fold-simplify-the-zhdr-initialization-code-in-init_z3fold_page.patch mm-compaction-remove-duplicated-vm_bug_on_page-pagelocked.patch mm-mempolicy-use-helper-range_in_vma-in-queue_pages_test_walk.patch hugetlbfs-remove-useless-bug_oninode-in-hugetlbfs_setattr.patch hugetlbfs-use-helper-macro-default_hstate-in-init_hugetlbfs_fs.patch hugetlbfs-correct-obsolete-function-name-in-hugetlbfs_read_iter.patch hugetlbfs-remove-meaningless-variable-avoid_reserve.patch hugetlbfs-make-hugepage-size-conversion-more-readable.patch hugetlbfs-correct-some-obsolete-comments-about-inode-i_mutex.patch hugetlbfs-fix-some-comment-typos.patch hugetlbfs-remove-unneeded-return-value-of-hugetlb_vmtruncate.patch mm-memory_hotplug-use-helper-function-zone_end_pfn-to-get-end_pfn.patch mm-mlock-stop-counting-mlocked-pages-when-none-vma-is-found.patch mm-rmap-correct-some-obsolete-comments-of-anon_vma.patch mm-rmap-remove-unneeded-semicolon-in-page_not_mapped.patch mm-rmap-fix-obsolete-comment-in-__page_check_anon_rmap.patch mm-rmap-use-page_not_mapped-in-try_to_unmap.patch mm-rmap-correct-obsolete-comment-of-page_get_anon_vma.patch mm-rmap-fix-potential-pte_unmap-on-an-not-mapped-pte.patch mm-zsmallocc-convert-to-use-kmem_cache_zalloc-in-cache_alloc_zspage.patch mm-zsmallocc-use-page_private-to-access-page-private.patch